Changeset 8c10ec9

Timestamp:

Apr 22, 2018 11:13:32 PM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

38e109d

Parents:

b9a2459

Message:

Realised a better way to handle the build process of both the
Browser Bundle i2p launcher, as well as the upcoming Mac OS X
i2p launcher. They share some few properties and how code has
to be managed for both system's update managers and so on.
More details will be documentated in README.md files as well as
in those commit messages I now write

Files:

• build.xml (modified) (1 diff)
• launcher/README.md (deleted)
• launcher/build.sbt (deleted)
• launchers/README.md (added)
• launchers/browserbundle/README.md (added)
• launchers/browserbundle/build.sbt (added)
• launchers/browserbundle/src/main/resources/blocklist.txt (moved) (moved from launcher/src/main/resources/blocklist.txt)
• launchers/browserbundle/src/main/resources/clients.config (moved) (moved from launcher/src/main/resources/clients.config)
• launchers/browserbundle/src/main/resources/continents.txt (moved) (moved from launcher/src/main/resources/continents.txt)
• launchers/browserbundle/src/main/resources/countries.txt (moved) (moved from launcher/src/main/resources/countries.txt)
• launchers/browserbundle/src/main/resources/geoip.txt (moved) (moved from launcher/src/main/resources/geoip.txt)
• launchers/browserbundle/src/main/resources/hosts.txt (moved) (moved from launcher/src/main/resources/hosts.txt)
• launchers/browserbundle/src/main/resources/i2ptunnel.config (moved) (moved from launcher/src/main/resources/i2ptunnel.config)
• launchers/browserbundle/src/main/resources/logger.config (moved) (moved from launcher/src/main/resources/logger.config)
• launchers/browserbundle/src/main/resources/router.config (moved) (moved from launcher/src/main/resources/router.config)
• launchers/browserbundle/src/main/resources/webapps.config (moved) (moved from launcher/src/main/resources/webapps.config)
• launchers/browserbundle/src/main/scala/net/i2p/DeployProfile.scala (moved) (moved from launcher/src/main/scala/net/i2p/DeployProfile.scala)
• launchers/browserbundle/src/main/scala/net/i2p/RouterLauncherApp.scala (moved) (moved from launcher/src/main/scala/net/i2p/RouterLauncherApp.scala)
• launchers/build.sbt (added)
• launchers/macosx/README.md (added)
• launchers/macosx/build.sbt (added)
• launchers/macosx/src/main/scala/net/i2p/MacOSXRouterLauncherApp.scala (added)
• launchers/project/build.properties (moved) (moved from launcher/project/build.properties)
• launchers/project/plugins.sbt (moved) (moved from launcher/project/plugins.sbt)
• launchers/sbt (moved) (moved from launcher/sbt)

build.xml

@@ -296 +296 @@
             ]]>
         </script>
+    </target>
+
+    <target name="bbLauncher" depends="build">
+        <sequential>
+            <exec executable="sbt" dir="launcher" failonerror="true">
+                <arg value="browserbundle:clean" />
+            </exec>
+            <exec executable="sbt" dir="launcher" failonerror="true">
+                <arg value="browserbundle:assembly" />
+            </exec>
+        </sequential>
+    </target>
+
+    <target name="osxLauncher" depends="build">
+        <sequential>
+            <exec executable="sbt" dir="launcher" failonerror="true">
+                <arg value="macosx:clean" />
+            </exec>
+            <exec executable="sbt" dir="launcher" failonerror="true">
+                <arg value="macosx:assembly" />
+            </exec>
+        </sequential>
     </target>