Switch around crx3 versions

.github/workflows/ant.yml

@@ -24,7 +24,7 @@ jobs:
           echo "build.built-by=GitHub Actions" >> override.properties
           echo "noExe=true" >> override.properties
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-linux; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -115,7 +115,7 @@ jobs:
           echo "build.built-by=GitHub Actions" >> override.properties
           echo "noExe=true" >> override.properties
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-linux; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -211,7 +211,7 @@ jobs:
           bash -c 'echo "build.built-by=GitHub Actions" >> override.properties'
           bash -c 'echo "noExe=true" >> override.properties'
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-osx; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version

VERSION.md

@@ -6,23 +6,23 @@ Extension Versions
 
 ```md
 i2p-in-private-browsing
-1.48
-https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
+2.6.0
+https://addons.mozilla.org/firefox/downloads/file/4339795/i2p_in_private_browsing-2.6.0.xpi
 noscript
-11.4.29
-https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
+11.4.34
+https://addons.mozilla.org/firefox/downloads/file/4333280/noscript-11.4.34.xpi
 localcdn-fork-of-decentraleyes
-2.6.69
-https://addons.mozilla.org/firefox/downloads/file/4303757/localcdn_fork_of_decentraleyes-2.6.69.xpi
+2.6.72
+https://addons.mozilla.org/firefox/downloads/file/4336546/localcdn_fork_of_decentraleyes-2.6.72.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.18.1
-https://addons.mozilla.org/firefox/downloads/file/4310951/javascript_restrictor-0.18.1.xpi
+0.19
+https://addons.mozilla.org/firefox/downloads/file/4339678/javascript_restrictor-0.19.xpi
 ublock-origin
-1.58.0
-https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi
+1.59.0
+https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi
 ```
 
 ## Chromium
@@ -32,15 +32,15 @@ __MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.30
+11.4.33
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.67
+2.6.72
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.58.0
+1.59.0
 https://clients2.google.com/service/update2/crx
 __MSG_extensionName__
-0.18.1
+0.19
 https://clients2.google.com/service/update2/crx
 ```

build.xml

@@ -522,6 +522,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <exec executable="rm" failonerror="true" osfamily="windows">
             <arg value="-rf" />
@@ -557,6 +558,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--icon"/> <arg value="src/icon.png"/>
             <arg value="--app-version"/> <arg value="1.0.0"/>
             <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
@@ -574,6 +576,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--icon"/> <arg value="src/icon.png"/>
             <arg value="--app-version"/> <arg value="${release.number}"/>
             <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
@@ -592,6 +595,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="fedora-release" depends="jar">
@@ -608,6 +612,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows" depends="jar">
@@ -628,6 +633,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-release" depends="jar">
@@ -648,6 +654,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-msi" depends="jar">
@@ -668,6 +675,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-msi-release" depends="jar">
@@ -688,6 +696,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-portable" depends="jar">
@@ -700,6 +709,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
         <delete file="i2pbrowser-portable.zip"/>
@@ -719,6 +729,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
         <delete file="i2pbrowser-portable.zip"/>
@@ -742,6 +753,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-release" depends="jar">
@@ -757,6 +769,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-pkg" depends="jar">
@@ -772,6 +785,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-pkg-release" depends="jar">
@@ -787,6 +801,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
 

config.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Updates extensions, plugin support temporarily removed(Stay on the old version)"
+export GITHUB_NAME="Fixes the build system"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md)
 export GITHUB_TAG=$(git describe --tags --abbrev=0)

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Jul 08 17:35:59 EDT 2024
-build.number=726
+#Tue Aug 20 23:41:03 EDT 2024
+build.number=746

src/usability.properties

@@ -0,0 +1,2 @@
+main-class=net.i2p.i2pfirefox.I2PBrowser
+arguments=-usability

tools.sh

@@ -0,0 +1,43 @@
+#! /usr/bin/env sh
+
+. ./config.sh
+#./preprelease.sh
+github-release release --user "${GITHUB_USER}" \
+    --repo "${GITHUB_REPO}" \
+    --name "Build Tools" \
+    --description "binaries required for generating the profiles" \
+    --tag "build-tools"; true
+echo "Uploading generated build-tools"
+sleep 2s
+torsum=$(sha256sum $HOME/go/bin/crx3 | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Linux. ${torsum}" \
+    --name "crx3-linux" \
+    --file "$HOME/go/bin/crx3"
+echo "Uploaded crx3 linux package"
+torsum=$(sha256sum $HOME/go/bin/darwin_amd64/crx3 | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Mac. ${torsum}" \
+    --name "crx3-osx" \
+    --file "$HOME/go/bin/darwin_amd64/crx3"
+echo "Uploaded crx3 mac package"
+torsum=$(sha256sum $HOME/go/bin/windows_amd64/crx3.exe | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Windows. ${torsum}" \
+    --name "crx3.exe" \
+    --file "$HOME/go/bin/windows_amd64/crx3.exe"
+echo "Uploaded crx3 windows package"
+git pull github --tags
+git push --all