Author: nextgens
Date: 2008-06-02 14:40:36 +0000 (Mon, 02 Jun 2008)
New Revision: 20184
Removed:
trunk/apps/new_installer/res/unix/bin/install_frost.sh
trunk/apps/new_installer/res/unix/bin/install_jSite.sh
trunk/apps/new_installer/res/unix/bin/install_thaw.sh
trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
trunk/apps/new_installer/res/windows/bin/install_frost.cmd
trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
Modified:
trunk/apps/new_installer/ProcessPanel.Spec.xml
trunk/apps/new_installer/Unix_shortcutSpec.xml
trunk/apps/new_installer/Win_shortcutSpec.xml
trunk/apps/new_installer/install.xml
Log:
new_installer: unbundle all 3rd party apps
Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-06-02 14:06:17 UTC
(rev 20183)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-06-02 14:40:36 UTC
(rev 20184)
@@ -102,44 +102,6 @@
<executefile name="$INSTALL_PATH/bin/1run.sh"/>
</job>
- <!-- Applications now -->
- <job name="Setting Thaw up">
- <os family="unix"/>
- <os family="mac"/>
- <executefile name="$INSTALL_PATH/bin/install_thaw.sh"/>
- </job>
- <job name="Setting Thaw up">
- <os family="windows"/>
- <executefile name="$INSTALL_PATH\bin\install_thaw.cmd"/>
- </job>
- <job name="Setting Thingamablog up">
- <os family="unix"/>
- <os family="mac"/>
- <executefile name="$INSTALL_PATH/bin/install_thingamablog.sh"/>
- </job>
- <job name="Setting Thingamablog up">
- <os family="windows"/>
- <executefile name="$INSTALL_PATH\bin\install_thingamablog.cmd"/>
- </job>
- <job name="Setting Frost up">
- <os family="unix"/>
- <os family="mac"/>
- <executefile name="$INSTALL_PATH/bin/install_frost.sh"/>
- </job>
- <job name="Setting Frost up">
- <os family="windows"/>
- <executefile name="$INSTALL_PATH\bin\install_frost.cmd"/>
- </job>
- <job name="Setting jSite up">
- <os family="unix"/>
- <os family="mac"/>
- <executefile name="$INSTALL_PATH/bin/install_jSite.sh"/>
- </job>
- <job name="Setting jSite up">
- <os family="windows"/>
- <executefile name="$INSTALL_PATH\bin\install_jsite.cmd"/>
- </job>
-
<!-- Do I have to mention that nothing ought to be below ? -->
<job name="Cleaning up">
<os family="unix"/>
Modified: trunk/apps/new_installer/Unix_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Unix_shortcutSpec.xml 2008-06-02 14:06:17 UTC
(rev 20183)
+++ trunk/apps/new_installer/Unix_shortcutSpec.xml 2008-06-02 14:40:36 UTC
(rev 20184)
@@ -109,70 +109,4 @@
<createForPack name="Base" />
</shortcut>
-
- <shortcut
- name="Thaw"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="java"
- commandLine="-jar "$INSTALL_PATH/Thaw/Thaw.jar""
-
- initialState="noShow"
- iconFile="trashcan_full"
- iconIndex="0"
- workingDirectory="$INSTALL_PATH/Thaw"
- type="Application"
- encoding="UTF-8"
- createForAll="false"
- description="This starts Thaw: a tool to manage your node's
global queue">
-
- <createForPack name="thaw" />
- </shortcut>
-
- <shortcut
- name="Thingamablog"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="java"
- commandLine="-jar
"$INSTALL_PATH/thingamablog-testing/thingamablog.jar""
-
- initialState="noShow"
- iconFile="trashcan_full"
- iconIndex="0"
- workingDirectory="$INSTALL_PATH/thingamablog-testing"
- type="Application"
- encoding="UTF-8"
- createForAll="false"
- description="This starts Thingamablog: a tool that makes
authoring and publishing your flogs (freenet blogs) almost effortless">
-
- <createForPack name="thingamablog" />
- </shortcut>
-
- <shortcut
- name="Frost"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="sh"
- commandLine=" "$INSTALL_PATH/frost/frost.sh""
-
- initialState="noShow"
- iconFile="trashcan_full"
- iconIndex="0"
- workingDirectory="$INSTALL_PATH/frost"
- type="Application"
- encoding="UTF-8"
- createForAll="false"
- description="This starts frost: a news like messenging utility
for freenet">
-
- <createForPack name="frost" />
- </shortcut>
</shortcuts>
Modified: trunk/apps/new_installer/Win_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Win_shortcutSpec.xml 2008-06-02 14:06:17 UTC
(rev 20183)
+++ trunk/apps/new_installer/Win_shortcutSpec.xml 2008-06-02 14:40:36 UTC
(rev 20184)
@@ -38,63 +38,6 @@
</shortcut>
<shortcut
- name="jSite"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\jsite.cmd"
- description="This starts jSite"
- workingDirectory="$INSTALL_PATH\"
- >
- <createForPack name="jSite" />
- </shortcut>
-
- <shortcut
- name="Thingamablog"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\thingamablog.cmd"
- description="This starts Thingamablog: a tool that makes
authoring and publishing your flogs (freenet blogs) almost effortless"
- workingDirectory="$INSTALL_PATH\thingamablog-testing"
- >
- <createForPack name="thingamablog" />
- </shortcut>
-
- <shortcut
- name="Thaw"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\thaw.cmd"
- description="This starts Thaw"
- workingDirectory="$INSTALL_PATH\Thaw"
- >
- <createForPack name="thaw" />
- </shortcut>
-
- <shortcut
- name="Frost"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\frost\frost.bat"
- commandLine=""
- description="This starts Frost"
- workingDirectory="$INSTALL_PATH\frost"
- >
- <createForPack name="frost" />
- </shortcut>
-
- <shortcut
name="Stop Freenet"
programGroup="yes"
desktop="yes"
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-06-02 14:06:17 UTC (rev
20183)
+++ trunk/apps/new_installer/install.xml 2008-06-02 14:40:36 UTC (rev
20184)
@@ -258,33 +258,6 @@
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/xmllibrarian"/>
</pack>
- <pack name="3rd party" id="3rd party" required="no">
- <description>A set of 3rd party tools for
freenet</description>
- </pack>
-
- <pack name="jSite" id="jsite" required="no" parent="3rd party">
- <description>A tool to upload websites to
freenet</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/jsite.install"/>
- </pack>
-
- <pack name="thingamablog" id="thingamablog" required="no"
parent="3rd party">
- <description>Thingamablog is a cross-platform,
standalone blogging application that makes authoring and publishing your flogs
(freenet blogs) almost effortless.</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thingamablog.install"/>
- </pack>
-
- <!--
- <pack name="frost" id="frost" required="no">
- <description>A message board application for freenet
(http://jtcfrost.sourceforge.net/)</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/frost.install"/>
- </pack>
- -->
-
- <pack name="thaw" id="thaw" required="no" parent="3rd party">
- <description>A powerful filesharing tool designed for
freenet</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thaw.install"/>
- </pack>
- </packs>
-
<!-- The native libraries to add
http://svn.berlios.de/svnroot/repos/izpack/izpack-src/trunk/src/native/ -->
<native type="3rdparty" name="COIOSHelper.dll" stage="both"
os="windows"/>
<native type="izpack" name="ShellLink.dll" stage="install"
os="windows"/>
Deleted: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. "$HOME/_install_toSource.sh"|| exit 0
-cd "$INSTALL_PATH"
-
-if test -e frost.install
-then
- rm -f frost.install
- if test ! -e offline
- then
- echo "Downloading frost"
- java $JOPTS -jar bin/sha1test.jar frost.zip ./ >/dev/null 2>&1
|| exit 1
- fi
- echo "Unzipping frost"
- mkdir frost
- java $JOPTS -jar bin/uncompress.jar frost.zip frost "$CAFILE"
>/dev/null 2>&1
-fi
Deleted: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. "$HOME/_install_toSource.sh"|| exit 0
-cd "$INSTALL_PATH"
-
-if test -e jsite.install
-then
- rm -f jsite.install
- if test ! -e offline
- then
- echo "Downloading jSite"
- mkdir jSite
- java $JOPTS -jar bin/sha1test.jar jSite.jar jSite "$CAFILE"
>/dev/null 2>&1 || exit 1
- fi
-fi
Deleted: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. "$HOME/_install_toSource.sh"|| exit 0
-cd "$INSTALL_PATH"
-
-if test -e thaw.install
-then
- rm -f thaw.install
- if test ! -e offline
- then
- echo "Downloading Thaw"
- mkdir Thaw
- java $JOPTS -jar bin/sha1test.jar Thaw.jar Thaw "$CAFILE"
>/dev/null 2>&1 || exit 1
- fi
-fi
Deleted: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-06-02 14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-06-02 14:40:36 UTC (rev 20184)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-. "$HOME/_install_toSource.sh"|| exit 0
-cd "$INSTALL_PATH"
-
-if test -e thingamablog.install
-then
- rm -f thingamablog.install
- if test ! -e offline
- then
- echo "Downloading thingamablog"
- java $JOPTS -jar bin/sha1test.jar thingamablog.zip ./ "$CAFILE"
>/dev/null 2>&1 || exit 1
- fi
- echo "Unzipping thingamablog"
- java $JOPTS -jar bin/uncompress.jar thingamablog.zip . >/dev/null 2>&1
-fi
Deleted: trunk/apps/new_installer/res/windows/bin/install_frost.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,18 +0,0 @@
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at set INSTALL_PATH=$INSTALL_PATH
- at set JAVA_HOME=$JAVA_HOME
- at set CAFILE=startssl.pem
- at cd /D %INSTALL_PATH%
- at if exist .isInstalled goto end
-
- at if not exist frost.install goto nofrost
- at del /F frost.install > NUL
- at if exist offline goto end
- at echo Downloading Frost
- at java -jar bin\sha1test.jar frost.zip . %CAFILE% > NUL
-:end
- at echo Setting Frost up
- at mkdir frost
- at java -jar bin\uncompress.jar frost.zip frost > NUL
-:nofrost
-:end
Deleted: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,18 +0,0 @@
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at set INSTALL_PATH=$INSTALL_PATH
- at set JAVA_HOME=$JAVA_HOME
- at set CAFILE=startssl.pem
- at cd /D %INSTALL_PATH%
- at if exist .isInstalled goto end
-
- at if not exist jsite.install goto nojsite
- at del /F jsite.install > NUL
- at if exist offline goto end
- at echo Downloading jSite
- at mkdir jSite
- at java -jar bin\sha1test.jar jSite.jar jSite %CAFILE% > NUL
-:end
- at echo @cd jSite > jsite.cmd
- at echo @start javaw -jar jSite.jar >> jsite.cmd
-:nojsite
-:end
Deleted: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-06-02
14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-06-02
14:40:36 UTC (rev 20184)
@@ -1,19 +0,0 @@
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at set INSTALL_PATH=$INSTALL_PATH
- at set JAVA_HOME=$JAVA_HOME
- at set CAFILE=startssl.pem
- at cd /D %INSTALL_PATH%
- at if exist .isInstalled goto end
-
- at if not exist thaw.install goto nothaw
- at del /F thaw.install > NUL
- at echo Downloading Thaw
- at if exist offline goto end
- at mkdir Thaw
- at java -jar bin\sha1test.jar Thaw.jar Thaw %CAFILE% > NUL
-:end
- at echo Setting Thaw up
- at echo @cd Thaw >thaw.cmd
- at echo @start javaw -jar Thaw.jar >> thaw.cmd
-:nothaw
-:end
Deleted: trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
2008-06-02 14:06:17 UTC (rev 20183)
+++ trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
2008-06-02 14:40:36 UTC (rev 20184)
@@ -1,19 +0,0 @@
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at set INSTALL_PATH=$INSTALL_PATH
- at set JAVA_HOME=$JAVA_HOME
- at set CAFILE=startssl.pem
- at cd /D %INSTALL_PATH%
- at if exist .isInstalled goto end
-
- at if not exist thingamablog.install goto nothingamablog
- at del /F thingamablog.install > NUL
- at if exist offline goto end
- at echo Downloading Thingamablog
- at java -jar bin\sha1test.jar thingamablog.zip . %CAFILE% > NUL
-:end
- at echo Setting Thingamablog up
- at java -jar bin\uncompress.jar thingamablog.zip . > NUL
- at echo @cd thingamablog-testing > thingamablog.cmd
- at echo @start javaw -jar thingamablog.jar >> thingamablog.cmd
-:nothingamablog
-:end
