diff --git a/.gitignore b/.gitignore index 2991d3c..5b77355 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ onionkeys tlskeys tmp /.stfolder/ -/.vscode/ \ No newline at end of file +/.vscode/ +*github-release-config*.sh* \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c7ddb6c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,45 @@ +FROM debian:sid + +## Originally found at: https://yusuke.blog/2021/10/19/3149 and updated to Java 20. + +RUN dpkg --add-architecture i386 +RUN apt-get update +RUN apt-get install -y curl fakeroot unzip gnupg dos2unix make nsis* dos2unix curl jq + +# install JDK +RUN curl --output /opt/java20.zip https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_windows-x64_bin.zip \ + && cd /opt/ \ + && unzip java20.zip \ + && rm java20.zip +ENV JAVA_HOME /opt/jdk-20.0.1 + +# install Wine +RUN apt-get update +RUN apt install --install-recommends wine wine64* wine-binfmt fonts-wine -y +RUN wine --version +RUN wine wineboot --init + +# install WIX TOOLSET +RUN mkdir /opt/wix311 \ + && cd /opt/wix311 \ + && curl -L --output /opt/wix311/wix311.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip \ + && unzip wix311.zip \ + && rm wix311.zip + +# WIX TOOLSET is requring .NET. +RUN curl --output winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks &&\ + chmod +x winetricks && \ + mv -v winetricks /usr/local/bin + +# DONNO why dotnet48 installation fails with "warning: exit status 5 - user selected 'Cancel' " +# https://forum.winehq.org/viewtopic.php?f=8&t=35724 +#ENV WINEPREFIX=/dotnet-test +#RUN /usr/local/bin/winetricks --optout -q dotnet48 + +ENV WINEPATH /opt/jdk-20.0.1/bin\;/opt/wix311 + +WORKDIR /root +COPY . /root +RUN echo "wine /opt/jdk-20.0.1/bin/jpackage.exe $@" > /opt/jdk-20.0.1/bin/jpackage +RUN chmod +x /opt/jdk-20.0.1/bin/jpackage +CMD ./buildscripts/build.sh \ No newline at end of file diff --git a/config.sh b/config.sh index e429821..30e156c 100755 --- a/config.sh +++ b/config.sh @@ -117,9 +117,11 @@ fi # You can also use this to temporarily add applications into the PATH that are # required to build this if you do not wish to edit your PATH across the entire # Windows session, and for setting ANT_HOME -ANT_HOME=$(ls -d /c/apache-ant-*) -export ANT_HOME="$ANT_HOME" -export PATH="$PATH:$ANT_HOME/bin/" +if [ -d "/c/apache-ant-"* ]; then + ANT_HOME=$(ls -d /c/apache-ant-*) + export ANT_HOME="$ANT_HOME" + export PATH="$PATH:$ANT_HOME/bin/" +fi if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" diff --git a/i2pversion b/i2pversion index 0c64272..085df36 100644 --- a/i2pversion +++ b/i2pversion @@ -7,9 +7,9 @@ export I2PFIREFOX_VERSION=1.0.9 # Comment this out to build from an alternate branch or # the tip of the master branch. VERSIONMAJOR=2 -VERSIONMINOR=2 -VERSIONBUILD=1 +VERSIONMINOR=3 +VERSIONBUILD=0 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD" export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD" -VERSION=i2p-2.2.1 -export VERSION=i2p-2.2.1 \ No newline at end of file +VERSION=i2p-2.3.0 +export VERSION=i2p-2.3.0 \ No newline at end of file