[freenet-cvs] r18320 - in trunk/apps/new_installer: . res/unix/bin res/windows/bin

nextgens at freenetproject.org nextgens at freenetproject.org
Mon Mar 3 13:34:59 UTC 2008


Author: nextgens
Date: 2008-03-03 13:34:59 +0000 (Mon, 03 Mar 2008)
New Revision: 18320

Added:
   trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
   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: bundle thingamablog
NEEDS TESTING


Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml	2008-03-03 13:25:08 UTC (rev 18319)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml	2008-03-03 13:34:59 UTC (rev 18320)
@@ -147,6 +147,18 @@
 		<os family="windows"/>
 		<executefile name="$INSTALL_PATH\bin\install_thaw.cmd"/>
 	</job>
+	<job name="Setting Thingamablog up">
+		<os family="unix"/>
+		<executefile name="$INSTALL_PATH/bin/install_thingamablog.sh"/>
+	</job>
+	<job name="Setting Thingamablog up">
+		<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"/>
 		<executefile name="$INSTALL_PATH/bin/install_frost.sh"/>

Modified: trunk/apps/new_installer/Unix_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Unix_shortcutSpec.xml	2008-03-03 13:25:08 UTC (rev 18319)
+++ trunk/apps/new_installer/Unix_shortcutSpec.xml	2008-03-03 13:34:59 UTC (rev 18320)
@@ -129,6 +129,28 @@
 	</shortcut>
 
 	<shortcut
+		name="Thingamablog"
+		programGroup="yes"
+		desktop="no"
+		applications="no"
+		startMenu="no"
+		startup="no"
+		target="java"
+		commandLine="-jar &quot;$INSTALL_PATH/thingamablog-testing/thingamablog.jar&quot;"
+
+		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"

Modified: trunk/apps/new_installer/Win_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Win_shortcutSpec.xml	2008-03-03 13:25:08 UTC (rev 18319)
+++ trunk/apps/new_installer/Win_shortcutSpec.xml	2008-03-03 13:34:59 UTC (rev 18320)
@@ -51,6 +51,20 @@
 	</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"

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml	2008-03-03 13:25:08 UTC (rev 18319)
+++ trunk/apps/new_installer/install.xml	2008-03-03 13:34:59 UTC (rev 18320)
@@ -153,6 +153,7 @@
 			<parsable targetfile="$INSTALL_PATH\bin\install_jsite.cmd"/>
 			<parsable targetfile="$INSTALL_PATH\bin\install_plugins.cmd"/>
 			<parsable targetfile="$INSTALL_PATH\bin\install_thaw.cmd"/>
+			<parsable targetfile="$INSTALL_PATH\bin\install_thingamablog.cmd"/>
 			<parsable targetfile="$INSTALL_PATH\bin\install_updater.cmd"/>
 			<parsable targetfile="$INSTALL_PATH\bin\install_wrapper.cmd"/>
 			<parsable targetfile="$INSTALL_PATH\bin\install_opennet.cmd"/>
@@ -187,6 +188,7 @@
 			<parsable targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
+			<parsable targetfile="$INSTALL_PATH/bin/install_thingamablog.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_freenet-stable-latest.sh"/>
@@ -224,6 +226,7 @@
 			<parsable targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
+			<parsable targetfile="$INSTALL_PATH/bin/install_thingamablog.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
 			<parsable targetfile="$INSTALL_PATH/bin/install_freenet-stable-latest.sh"/>
@@ -272,6 +275,11 @@
 			<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">
+			<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>

Added: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh	                        (rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh	2008-03-03 13:34:59 UTC (rev 18320)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e thingamablog.install
+then
+	rm -f thingamablog.install
+	if test ! -e offline
+	then
+		echo "Downloading thingamablog"
+		java -jar bin/sha1test.jar thingamablog/thingamablog.zip ./ >/dev/null 2>&1 || exit 1
+	fi
+	echo "Unzipping thingamablog"
+	java -jar bin/uncompress.jar thingamablog.zip . >/dev/null 2>&1
+fi


Property changes on: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd	                        (rev 0)
+++ trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd	2008-03-03 13:34:59 UTC (rev 18320)
@@ -0,0 +1,16 @@
+ at set PATH=%SYSTEMROOT%\System32\;%PATH%
+ at set INSTALL_PATH=$INSTALL_PATH
+ at set JAVA_HOME=$JAVA_HOME
+ at cd /D %INSTALL_PATH%
+
+ 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/thingamablog.zip . > 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




More information about the cvs mailing list