[freenet-cvs] r8477 - trunk/website/pages
Author: bob Date: 2006-04-05 22:39:56 + (Wed, 05 Apr 2006) New Revision: 8477 Modified: trunk/website/pages/download-new.php Log: Changed link to new 0.7 wrapper, which only downloads Java if it needs it (rather than always being bundled with it and therefore rather large.) Old wrapper is still there in case of problems. Modified: trunk/website/pages/download-new.php === --- trunk/website/pages/download-new.php2006-04-05 22:22:29 UTC (rev 8476) +++ trunk/website/pages/download-new.php2006-04-05 22:39:56 UTC (rev 8477) @@ -20,7 +20,8 @@ for some info. Windows -- Download and run http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;>freenet-webinstall +- Download and run http://downloads.freenetproject.org/freenet-pre-07-alpha-nojava.exe;>freenet-webinstall + It will automatically install Freenet and other required components for you. When done, your default browser will automatically open up to Freenet's web-based user interface. (Freenet contains NO spyware or adware , it's Free Software! The source code is publicly available for review)
[freenet-cvs] r8476 - trunk/contrib/win_wrapper
Author: bob Date: 2006-04-05 22:22:29 + (Wed, 05 Apr 2006) New Revision: 8476 Modified: trunk/contrib/win_wrapper/07wrapper.nsi Log: Minor fixes, primarily download timeout before retry prompt reduced to 10 seconds from 150(!) Modified: trunk/contrib/win_wrapper/07wrapper.nsi === --- trunk/contrib/win_wrapper/07wrapper.nsi 2006-04-05 22:20:24 UTC (rev 8475) +++ trunk/contrib/win_wrapper/07wrapper.nsi 2006-04-05 22:22:29 UTC (rev 8476) @@ -44,7 +44,6 @@ #!insertmacro MUI_PAGE_FINISH !define MUI_ABORTWARNING -# define MUI_UNINSTALLER !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -105,7 +104,7 @@ !else DownloadAndInstallJava: # If they don't want to download/install Java, finish - MessageBox MB_YESNO "You don't seem to have Java installed, which is needed by Freenet.$\r$\n$\r$\nDo you want me to download and install Java now?" IDNO InstallDone + MessageBox MB_YESNO "You don't seem to have Java installed, which is needed by Freenet.$\r$\n$\r$\nDo you want me to download and install Java now?" IDNO JavaInstallAborted # Otherwise fetch JRE to user's temp and run it GetFullPathName /SHORT $R1 $TEMP # get (user's) TEMP dir into $R1 SetOutPath "$R1" @@ -119,6 +118,15 @@ GoTo InstallStart# Should now have Java installed so try to detect again !endif +GoTo InstallDone # normally skip the following message + +JavaInstallAborted: +DetailPrint "Java installation cancelled, Freenet installation cannot continue." +DetailPrint "Java is required by Freenet." +DetailPrint "If the installer has trouble downloading it, you should be able" +DetailPrint "to download it from www.java.com" +MessageBox MB_OK "Installation of Freenet was cancelled.$\r$\n$\r$\nFreenet requires Java. You can let this installer get it,$\r$\nor download it yourself from www.java.com" + InstallDone: SectionEnd
[freenet-cvs] r8475 - trunk/win32-bin
Author: bob Date: 2006-04-05 22:20:24 + (Wed, 05 Apr 2006) New Revision: 8475 Modified: trunk/win32-bin/freenet-pre-07-alpha-nojava.exe Log: Minor fixes, primarily download timeout before retry prompt reduced to 10 seconds from 150(!) Modified: trunk/win32-bin/freenet-pre-07-alpha-nojava.exe === (Binary files differ)
[freenet-cvs] r8474 - trunk/apps/installer/installclasspath
Author: nextgens Date: 2006-04-05 21:30:50 + (Wed, 05 Apr 2006) New Revision: 8474 Modified: trunk/apps/installer/installclasspath/run.cmd Log: installer: ubject: [freenet-dev] 0.7 java installer currently broken on windows Modified: trunk/apps/installer/installclasspath/run.cmd === --- trunk/apps/installer/installclasspath/run.cmd 2006-04-05 21:00:22 UTC (rev 8473) +++ trunk/apps/installer/installclasspath/run.cmd 2006-04-05 21:30:50 UTC (rev 8474) @@ -1,6 +1,6 @@ @echo "Cleaning up" - at bin\wrapper.exe -r ../wrapper.conf + at bin\wrapper-windows-x86-32.exe -r ../wrapper.conf @net stop @serviceName@ @echo "Registering Freenet as a system service" - at bin\wrapper.exe -i ../wrapper.conf + at bin\wrapper-windows-x86-32.exe -i ../wrapper.conf @net start @serviceName@
[freenet-cvs] r8473 - trunk/apps/installer
Author: nextgens Date: 2006-04-05 21:00:22 + (Wed, 05 Apr 2006) New Revision: 8473 Modified: trunk/apps/installer/antinstall-config.xml Log: installer: some tunning has been done to improve the look and feel Modified: trunk/apps/installer/antinstall-config.xml === --- trunk/apps/installer/antinstall-config.xml 2006-04-05 20:38:01 UTC (rev 8472) +++ trunk/apps/installer/antinstall-config.xml 2006-04-05 21:00:22 UTC (rev 8473) @@ -1,13 +1,14 @@ http://antinstaller.sf.net/dtd/antinstall-config-0.7.dtd;> + minJavaVersion="1.4" + antialiased="true">
[freenet-cvs] r8472 - trunk/apps/installer
Author: nextgens Date: 2006-04-05 20:38:01 + (Wed, 05 Apr 2006) New Revision: 8472 Modified: trunk/apps/installer/antinstall-config.xml trunk/apps/installer/build.xml Log: installer: now we support offline install mode Modified: trunk/apps/installer/antinstall-config.xml === --- trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev 8471) +++ trunk/apps/installer/antinstall-config.xml 2006-04-05 20:38:01 UTC (rev 8472) @@ -22,15 +22,27 @@ + displayText="This installer support either non-anonymous testnet or anonymous darknet"/> + + + + + + + + + + + + + + + @@ -118,7 +121,7 @@ - + @@ -135,9 +138,10 @@ - - - + + + + @@ -254,6 +258,12 @@ + + + + + + @@ -273,14 +283,14 @@ - + - +
[freenet-cvs] r8471 - in trunk/apps/installer: . installclasspath/linux
Author: nextgens Date: 2006-04-05 19:55:47 + (Wed, 05 Apr 2006) New Revision: 8471 Modified: trunk/apps/installer/antinstall-config.xml trunk/apps/installer/build.xml trunk/apps/installer/installclasspath/linux/update.sh Log: installer: new version with improved update script on linux and jSite Modified: trunk/apps/installer/antinstall-config.xml === --- trunk/apps/installer/antinstall-config.xml 2006-04-05 12:39:51 UTC (rev 8470) +++ trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev 8471) @@ -119,6 +119,11 @@ displayText="Frost" defaultValue="true" force="false"/> + - - - - + + + + @@ -93,6 +93,7 @@ + @@ -117,7 +118,7 @@ - + @@ -188,11 +189,10 @@ - - - + + @@ -223,11 +223,10 @@ - - - + + @@ -265,6 +264,15 @@ + + + + + + + + + Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 12:39:51 UTC (rev 8470) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 19:55:47 UTC (rev 8471) @@ -18,10 +18,16 @@ echo "Your freenet node is up to date" fi -wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh -chmod +x update2.sh -LOCATION="$(pwd | sed -e 's/\//\\\//g')" -# we need to escape it, thanks to the_JinX for the hack -echo @path@ >/dev/null && sed -e "s/@path@/$LOCATION/" update2.sh > update.sh +wget -N -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh +diff --brief update.sh update2.sh +if [[ $? -ne 0 ]] +then + LOCATION="$(pwd | sed -e 's/\//\\\//g')" + # we need to escape it, thanks to the_JinX for the hack + WHAT="@pa" + WHAT2="th@" + cat update2.sh |sed "s/$WHAT$WHAT2/$LOCATION/" > update.sh + chmod +x update.sh +fi popd 2>&1 >/dev/null
[freenet-cvs] r8470 - trunk/website/pages
Author: mazzanet Date: 2006-04-05 12:39:51 + (Wed, 05 Apr 2006) New Revision: 8470 Modified: trunk/website/pages/download-new.php Log: Fix engrish Modified: trunk/website/pages/download-new.php === --- trunk/website/pages/download-new.php2006-04-05 08:59:46 UTC (rev 8469) +++ trunk/website/pages/download-new.php2006-04-05 12:39:51 UTC (rev 8470) @@ -8,7 +8,7 @@ When you first start Freenet 0.7 your node will not know any other nodes -on the network, you need to connect to other nodes, at least three. +on the network, you need to connect to other nodes - at least three. Ideally you should find people you trust that are already part of the Freenet 0.7 network and connect to them, but if that isn't possible in the early stages of the Freenet 0.7 network you can try connecting to @@ -20,14 +20,13 @@ for some info. Windows -- Run http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;>freenet-webinstall +- Download and run http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;>freenet-webinstall -It will automatically install Freenet and other required components for you. When done, he launch your browser directly on Freenet. +It will automatically install Freenet and other required components for you. When done, your default browser will automatically open up to Freenet's web-based user interface. (Freenet contains NO spyware or adware , it's Free Software! The source code is publicly available for review) -Freenet works best with Windows 2000 Professional, XP Professional or NT. Windows 95, 98 and 2000 Millennium Edition work rather -less well; in particular, the installer won't run on those operating systems. -If the executable doesn't work (if it goes seriously wrong), then please telll us, install Java, and try the below. +Freenet works best with Windows 2000 Professional, XP Professional or NT. Windows 95, 98 and 2000 Millennium Edition don't work as well; in particular, the installer won't run on those operating systems. +If the installer doesn't work (something seriously wrong) then please tell us know, install Java, and try the Linux instructions below. Mac OSX, Unix, and Linux You need to have a recent Java Runtime Environment. We have experienced best results with Sun's Java Runtime Environment which can be obtained from http://www.java.com/;>http://www.java.com/. @@ -48,12 +47,12 @@ java -jar http://downloads.freenetproject.org/alpha/installer/selfextractpack.jar -After you start Freenet wait a few seconds for it to start-up (on a +Afer you start Freenet, wait a few seconds for it to start up (on a slow computer, you may need to wait about 30 seconds), and visit http://127.0.0.1:/ in your web browser to access Freenet's user interface. -So its running, what do I do? +So it's running, what do I do? You need to get connected. If you know anyone running Freenet, ask them for their reference, and give them yours. If you visit http://code.bulix.org/;>code.bulix.org useful (please don't paste references into the #freenet IRC channel). -Note: You need to add their reference, and they need to add -yours, before your nodes can communicate. +Note: You need to add their reference and they need to add +yours before your nodes can communicate. -So i'm connected, what do I do? +So I'm connected, what do I do? You can find links to some pages in the index on the FProxy homepage at http://127.0.0.1:/. You can find links to some third party
[freenet-cvs] r8469 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:59:46 + (Wed, 05 Apr 2006) New Revision: 8469 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: installer: [11:00] < the_JinX> | nextgens: I don't know of a better way to 'fix' the update.sh Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:28:10 UTC (rev 8468) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:59:46 UTC (rev 8469) @@ -21,6 +21,7 @@ wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh chmod +x update2.sh LOCATION="$(pwd | sed -e 's/\//\\\//g')" -sed -e "s/@path@/$LOCATION/" update2.sh > update.sh +# we need to escape it, thanks to the_JinX for the hack +echo @path@ >/dev/null && sed -e "s/@path@/$LOCATION/" update2.sh > update.sh popd 2>&1 >/dev/null
[freenet-cvs] r8468 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:28:10 + (Wed, 05 Apr 2006) New Revision: 8468 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: installer: I need to escape the PWD, thanks to the_JinX for the bugreport Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:13:40 UTC (rev 8467) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:28:10 UTC (rev 8468) @@ -20,7 +20,7 @@ wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh chmod +x update2.sh -mv update2.sh update.sh +LOCATION="$(pwd | sed -e 's/\//\\\//g')" +sed -e "s/@path@/$LOCATION/" update2.sh > update.sh - popd 2>&1 >/dev/null
[freenet-cvs] r8467 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:13:40 + (Wed, 05 Apr 2006) New Revision: 8467 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: installer: wget seems to need --no-check-certificate to perform well Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:00:49 UTC (rev 8466) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:13:40 UTC (rev 8467) @@ -18,7 +18,7 @@ echo "Your freenet node is up to date" fi -wget -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh +wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh chmod +x update2.sh mv update2.sh update.sh
[freenet-cvs] r8466 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:00:49 + (Wed, 05 Apr 2006) New Revision: 8466 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: Doh Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 00:55:33 UTC (rev 8465) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:00:49 UTC (rev 8466) @@ -5,9 +5,6 @@ wget -o /dev/null -N http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar.url touch freenet-cvs-snapshot.jar.url.old -wget -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update.sh -chmod +x update.sh - diff --brief freenet-cvs-snapshot.jar.url freenet-cvs-snapshot.jar.url.old if [[ $? -ne 0 ]] then @@ -21,4 +18,9 @@ echo "Your freenet node is up to date" fi +wget -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh +chmod +x update2.sh +mv update2.sh update.sh + + popd 2>&1 >/dev/null
[freenet-cvs] r8465 - trunk/win32-bin
Author: bob Date: 2006-04-05 00:55:33 + (Wed, 05 Apr 2006) New Revision: 8465 Added: trunk/win32-bin/freenet-pre-07-alpha-nojava.exe Log: Version of the 0.7 wrapper installer built without bundled JRE, hence much smaller. It (optionally) downloads and installs a JRE from the downloads.freenetproject.org mirrors only if Java (specifically, javaws) cannot not found. Added: trunk/win32-bin/freenet-pre-07-alpha-nojava.exe === (Binary files differ) Property changes on: trunk/win32-bin/freenet-pre-07-alpha-nojava.exe ___ Name: svn:executable + * Name: svn:mime-type + application/octet-stream
[freenet-cvs] r8464 - trunk/contrib/win_wrapper
Author: bob Date: 2006-04-05 00:50:40 + (Wed, 05 Apr 2006) New Revision: 8464 Added: trunk/contrib/win_wrapper/07wrapper-bundled-java.nsi Modified: trunk/contrib/win_wrapper/07wrapper.nsi Log: 0.7 wrapper installer can now be built without bundled JRE, in which case it optionally downloads and installs it. Added: trunk/contrib/win_wrapper/07wrapper-bundled-java.nsi === --- trunk/contrib/win_wrapper/07wrapper-bundled-java.nsi2006-04-05 00:09:34 UTC (rev 8463) +++ trunk/contrib/win_wrapper/07wrapper-bundled-java.nsi2006-04-05 00:50:40 UTC (rev 8464) @@ -0,0 +1,5 @@ +# Use this to build bundled-with-java version of 0.7 wrapper +# Bob H + +!define JAVAINSTALLER jre-1_5_0_06-windows-i586-p.exe +!include "07wrapper.nsi" Property changes on: trunk/contrib/win_wrapper/07wrapper-bundled-java.nsi ___ Name: svn:executable + * Modified: trunk/contrib/win_wrapper/07wrapper.nsi === --- trunk/contrib/win_wrapper/07wrapper.nsi 2006-04-05 00:09:34 UTC (rev 8463) +++ trunk/contrib/win_wrapper/07wrapper.nsi 2006-04-05 00:50:40 UTC (rev 8464) @@ -1,21 +1,16 @@ # Freenet 0.7 (testing) JRE wrapper installer # Bob Hayes # -# - Run Java detection -# - If (suitable) JRE installed, invoke NextGen$ installer -# currently at http://emu.freenetproject.org/~nextgens/freenet.jnlp -# - Otherwise install JRE, then invoke it. -# - Don't have an "already have Java" installer like for 0.5x since in that case user -# is directed to just open the jnlp -# -# Continued web-dependence arguably not such a great thing :/ Could we just embed jars? +# Can now be built with or without Java bundled. +# If it is, installs it if neccessary. If not, downloads + installs it if neccessary. +# Then just invokes the funky Java installer via javaws which does the real work. -# !include "webinstall.inc"# download functions +!include "webinstall.inc"# download functions !include "MUI.nsh" # various wizard stuff -!define JAVAINSTALLER jre-1_5_0_06-windows-i586-p.exe # JRE installer to bundle +#!define JAVAINSTALLER jre-1_5_0_06-windows-i586-p.exe # JRE installer to bundle # JNLP that invokes the real 0.7 installer -!define JNLP_PATH "http://emu.freenetproject.org/~nextgens/freenet.jnlp; +!define JNLP_PATH "http://downloads.freenetproject.org/alpha/installer/freenet.jnlp; # Extra installer compression, requires upx.exe is in $PATH !packhdr temp.dat "upx.exe -9 temp.dat" @@ -24,7 +19,7 @@ ;Configuration ;General -Name "Freenet 0.7 pre-alpha" +Name "Freenet 0.7 alpha" !define PRODUCT_NAME "Freenet07alpha" !define PRODUCT_VERSION "pre-07-alpha" @@ -86,7 +81,11 @@ GoTo InstallDone JWSnotFound: - # We couldn't find Java installed, offer to install +!ifndef JAVAINSTALLER + # Couldn't find javaws and not bundled with Java, offer to get it + GoTo DownloadAndInstallJava +!endif + # We couldn't find Java installed but seem to be bundled with it, offer to install MessageBox MB_YESNO "You don't seem to have Java installed, which is needed by Freenet.$\r$\n$\r$\nInstall it now?" IDYES InstallJava # They don't want to install Java, abort @@ -94,8 +93,7 @@ GoTo InstallDone InstallJava: -# Should be built with bundled Java, so extract and call the installer -!ifdef JAVAINSTALLER +!ifdef JAVAINSTALLER# If built with bundled Java, extract and call the installer DetailPrint "Lauching Sun's Java Runtime Environment installation..." GetFullPathName /SHORT $R1 $TEMP # get (user's) TEMP dir into $R1 SetOutPath "$R1" @@ -105,7 +103,20 @@ GoTo InstallStart# Should now have Java installed so try to detect again !else - MessageBox MB_OK "Error: JAVAINSTALLER variable not set, no JRE bundled!" +DownloadAndInstallJava: + # If they don't want to download/install Java, finish + MessageBox MB_YESNO "You don't seem to have Java installed, which is needed by Freenet.$\r$\n$\r$\nDo you want me to download and install Java now?" IDNO InstallDone + # Otherwise fetch JRE to user's temp and run it + GetFullPathName /SHORT $R1 $TEMP # get (user's) TEMP dir into $R1 + SetOutPath "$R1" + Push "http://downloads.freenetproject.org/jre-latest.exe; + Push "$R1" + Push "jre-latest.exe" + Call RetryableDownload + ExecWait "$R1\jre-latest.exe" # run it, block + Delete "$R1\jre-latest.exe" # delete + + GoTo InstallStart# Should now have Java installed so try to detect again !endif InstallDone:
[freenet-cvs] r8463 - trunk/win32-bin
Author: bob Date: 2006-04-05 00:09:34 + (Wed, 05 Apr 2006) New Revision: 8463 Added: trunk/win32-bin/jre-latest.exe Log: Unmodified latest Sun JRE installer (currently 1.5.0_06) for win32 Copied: trunk/win32-bin/jre-latest.exe (from rev 8462, trunk/win32-bin/jre-1_5_0_06-windows-i586-p.exe)
[freenet-cvs] r8462 - trunk/win32-bin
Author: bob Date: 2006-04-04 23:58:32 + (Tue, 04 Apr 2006) New Revision: 8462 Added: trunk/win32-bin/jre-1_5_0_06-windows-i586-p.exe Log: Unmodified latest Sun JRE installer for win32 Added: trunk/win32-bin/jre-1_5_0_06-windows-i586-p.exe === (Binary files differ) Property changes on: trunk/win32-bin/jre-1_5_0_06-windows-i586-p.exe ___ Name: svn:executable + * Name: svn:mime-type + application/octet-stream
[freenet-cvs] r8461 - trunk/apps/installer/installclasspath/bin
Author: nextgens Date: 2006-04-04 23:08:32 + (Tue, 04 Apr 2006) New Revision: 8461 Added: trunk/apps/installer/installclasspath/bin/wrapper-solaris-sparc-64 trunk/apps/installer/installclasspath/bin/wrapper-solaris-x86-32 Log: [01:05] < toad_> | nextgens: i think solaris on x86 and solaris on sparc64 would be good Added: trunk/apps/installer/installclasspath/bin/wrapper-solaris-sparc-64 === (Binary files differ) Property changes on: trunk/apps/installer/installclasspath/bin/wrapper-solaris-sparc-64 ___ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/apps/installer/installclasspath/bin/wrapper-solaris-x86-32 === (Binary files differ) Property changes on: trunk/apps/installer/installclasspath/bin/wrapper-solaris-x86-32 ___ Name: svn:executable + * Name: svn:mime-type + application/octet-stream
[freenet-cvs] r8466 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:00:49 + (Wed, 05 Apr 2006) New Revision: 8466 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: Doh Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 00:55:33 UTC (rev 8465) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:00:49 UTC (rev 8466) @@ -5,9 +5,6 @@ wget -o /dev/null -N http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar.url touch freenet-cvs-snapshot.jar.url.old -wget -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update.sh -chmod +x update.sh - diff --brief freenet-cvs-snapshot.jar.url freenet-cvs-snapshot.jar.url.old if [[ $? -ne 0 ]] then @@ -21,4 +18,9 @@ echo Your freenet node is up to date fi +wget -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh +chmod +x update2.sh +mv update2.sh update.sh + + popd 21 /dev/null ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
[freenet-cvs] r8468 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:28:10 + (Wed, 05 Apr 2006) New Revision: 8468 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: installer: I need to escape the PWD, thanks to the_JinX for the bugreport Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:13:40 UTC (rev 8467) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:28:10 UTC (rev 8468) @@ -20,7 +20,7 @@ wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh chmod +x update2.sh -mv update2.sh update.sh +LOCATION=$(pwd | sed -e 's/\//\\\//g') +sed -e s/@path@/$LOCATION/ update2.sh update.sh - popd 21 /dev/null ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
[freenet-cvs] r8469 - trunk/apps/installer/installclasspath/linux
Author: nextgens Date: 2006-04-05 08:59:46 + (Wed, 05 Apr 2006) New Revision: 8469 Modified: trunk/apps/installer/installclasspath/linux/update.sh Log: installer: [11:00]the_JinX | nextgens: I don't know of a better way to 'fix' the update.sh Modified: trunk/apps/installer/installclasspath/linux/update.sh === --- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:28:10 UTC (rev 8468) +++ trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05 08:59:46 UTC (rev 8469) @@ -21,6 +21,7 @@ wget --no-check-certificate -o /dev/null https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/linux/update.sh -O update2.sh chmod +x update2.sh LOCATION=$(pwd | sed -e 's/\//\\\//g') -sed -e s/@path@/$LOCATION/ update2.sh update.sh +# we need to escape it, thanks to the_JinX for the hack +echo @path@ /dev/null sed -e s/@path@/$LOCATION/ update2.sh update.sh popd 21 /dev/null ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
[freenet-cvs] r8470 - trunk/website/pages
Author: mazzanet Date: 2006-04-05 12:39:51 + (Wed, 05 Apr 2006) New Revision: 8470 Modified: trunk/website/pages/download-new.php Log: Fix engrish Modified: trunk/website/pages/download-new.php === --- trunk/website/pages/download-new.php2006-04-05 08:59:46 UTC (rev 8469) +++ trunk/website/pages/download-new.php2006-04-05 12:39:51 UTC (rev 8470) @@ -8,7 +8,7 @@ p When you first start Freenet 0.7 your node will not know any other nodes -on the network, you need to connect to other nodes, at least three. +on the network, you need to connect to other nodes - at least three. Ideally you should find people you trust that are already part of the Freenet 0.7 network and connect to them, but if that isn't possible in the early stages of the Freenet 0.7 network you can try connecting to @@ -20,14 +20,13 @@ for some info./i BR nbsp;BR h3Windows/h3 -- Run biga href=http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;freenet-webinstall/a/bigbr +- Download and run biga href=http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;freenet-webinstall/a/bigbr br -It will automatically install Freenet and other required components for you. When done, he launch your browser directly on Freenet. br +It will automatically install Freenet and other required components for you. When done, your default browser will automatically open up to Freenet's web-based user interface. br (Freenet contains ubNO spyware or adware/b/u , it's Free Software! The source code is publicly available for review) BR nbsp;BR -Freenet works best with bWindows 2000 Professional, XP Professional or NT. /b Windows 95, 98 and 2000 Millennium Edition work rather -less well; in particular, the installer won't run on those operating systems.br -If the executable doesn't work (if it goes seriously wrong), then please telll us, install Java, and try the below. +Freenet works best with bWindows 2000 Professional, XP Professional or NT. /b Windows 95, 98 and 2000 Millennium Edition don't work as well; in particular, the installer won't run on those operating systems.br +If the installer doesn't work (something seriously wrong) then please tell us know, install Java, and try the Linux instructions below. h3Mac OSX, Unix, and Linux/h3 You need to have a recent Java Runtime Environment. We have experienced best results with Sun's Java Runtime Environment which can be obtained from a href=http://www.java.com/;http://www.java.com//a. BR @@ -48,12 +47,12 @@ java -jar http://downloads.freenetproject.org/alpha/installer/selfextractpack.jar /pre/p -PAfter you start Freenet wait a few seconds for it to start-up (on a +PAfer you start Freenet, wait a few seconds for it to start up (on a slow computer, you may need to wait about 30 seconds), and visit http://127.0.0.1:/ in your web browser to access Freenet's user interface. BR nbsp;BR /P -h3So its running, what do I do?/h3 +h3So it's running, what do I do?/h3 You need to get connected. If you know anyone running Freenet, ask them for their reference, and give them yours. If you visit a @@ -69,10 +68,10 @@ href=http://code.bulix.org/;code.bulix.org/a useful (please don't paste references into the #freenet IRC channel). p -/BNote: You need to add their reference, and they need to add -yours, before your nodes can communicate./b +/BNote: You need to add their reference and they need to add +yours before your nodes can communicate./b -h3So i'm connected, what do I do?/h3 +h3So I'm connected, what do I do?/h3 You can find links to some pages in the index on the FProxy homepage at http://127.0.0.1:/. You can find links to some third party ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
[freenet-cvs] r8471 - in trunk/apps/installer: . installclasspath/linux
Author: nextgens
Date: 2006-04-05 19:55:47 + (Wed, 05 Apr 2006)
New Revision: 8471
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/linux/update.sh
Log:
installer: new version with improved update script on linux and jSite
Modified: trunk/apps/installer/antinstall-config.xml
===
--- trunk/apps/installer/antinstall-config.xml 2006-04-05 12:39:51 UTC (rev
8470)
+++ trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev
8471)
@@ -119,6 +119,11 @@
displayText=Frost
defaultValue=true
force=false/
+ checkbox
+ property=jSite
+ displayText=jSite
+ defaultValue=true
+ force=false/
/page
page
ifProperty=${l33t}==1
Modified: trunk/apps/installer/build.xml
===
--- trunk/apps/installer/build.xml 2006-04-05 12:39:51 UTC (rev 8470)
+++ trunk/apps/installer/build.xml 2006-04-05 19:55:47 UTC (rev 8471)
@@ -76,11 +76,11 @@
equals arg1=${enableConsole} arg2=/
/condition
condition property=skip_frost value=true
- or
- equals arg1=${frost} arg2=false/
- equals arg1=${frost} arg2=/
- /or
+ equals arg1=${frost} arg2=false/
/condition
+ condition property=skip_jSite value=true
+ equals arg1=${jSite} arg2=false/
+ /condition
echo message=Name: ${Name}/
echo message=Bandwidth: ${Bandwidth}/
echo message=Port: ${Port}/
@@ -93,6 +93,7 @@
echo message=Fproxy: ${Fproxy}/
echo message=Console: ${Console}/
echo message=Frost: ${frost}/
+ echo message=jSite: ${jSite}/
/target
@@ -117,7 +118,7 @@
/replace
/target
- target name=default
depends=pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,start_browser
+ target name=default
depends=pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,jSite,start_browser
/target
target name=copy
@@ -188,11 +189,10 @@
/replace
copy file=${basedir}/linux/update.sh
tofile=${installDir}/update.sh/
- chmod file=${installDir}/update.sh perm=755/
-
replace file=${installDir}/update.sh
- replacefilter token=@path@ value=/${basedir}//
+ replacefilter token=@path@ value=/${installDir}//
/replace
+ chmod file=${installDir}/update.sh perm=755/
echo message=Creating shortcuts/
chmod file=${basedir}/linux/CreateDesktopShortcut.sh
perm=755/
@@ -223,11 +223,10 @@
/replace
copy file=${basedir}/linux/update.sh
tofile=${installDir}/update.sh/
- chmod file=${installDir}/update.sh perm=755/
-
replace file=${installDir}/update.sh
- replacefilter token=@path@ value=/${basedir}//
+ replacefilter token=@path@ value=/${installDir}//
/replace
+ chmod file=${installDir}/update.sh perm=755/
echo message=Creating shortcuts/
chmod file=${basedir}/linux/CreateDesktopShortcut.sh
perm=755/
@@ -265,6 +264,15 @@
untar src=${basedir}/frost.tbz dest=${installDir}
compression=bzip2/
/target
+ target name=jSite unless=skip_jSite
+ echo message=Downloading jSite/
+
+ java classpath=${basedir}/sha1test.jar classname=Sha1Test
failonerror=true fork=true resultproperty=frost.verified logError=true
+ arg value=jSite/jSite.jar/
+ /java
+ copy file=${basedir}/jSite.jar
tofile=${installDir}/jSite.jar/
+ /target
+
target name=tgmain
echo message=Downloading core components/
java classpath=${basedir}/sha1test.jar classname=Sha1Test
failonerror=true fork=true resultproperty=freenet-cvs-snapshot.verified
logError=true
Modified: trunk/apps/installer/installclasspath/linux/update.sh
===
--- trunk/apps/installer/installclasspath/linux/update.sh 2006-04-05
12:39:51 UTC (rev 8470)
+++
[freenet-cvs] r8472 - trunk/apps/installer
Author: nextgens
Date: 2006-04-05 20:38:01 + (Wed, 05 Apr 2006)
New Revision: 8472
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
Log:
installer: now we support offline install mode
Modified: trunk/apps/installer/antinstall-config.xml
===
--- trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev
8471)
+++ trunk/apps/installer/antinstall-config.xml 2006-04-05 20:38:01 UTC (rev
8472)
@@ -22,15 +22,27 @@
comment
displayText=although it pulls in a load of
code from Dijjer./
comment
- displayText=This installer support either
non-anonymous testnet or anonymous darknet operation. You can run it twice to
install both./
+ displayText=This installer support either
non-anonymous testnet or anonymous darknet/
+ comment
+ displayText=operation. You can
run it twice to install both./
select
property=l33t
- displayText=Which kind of user are you?
+ displayText=What kind of user are you?
defaultValue=0
option value=0 text=beginner/
option value=1 text=power user/
/select
+ comment
+ displayText=You can use offline mode if the installer
hasn't access to internet./
+ select
+ property=online
+ displayText=Installation mode?
+ defaultValue=0
+
+ option value=0 text=online/
+ option value=1 text=offline/
+ /select
/page
!-- type=license shows a license page to click through --
page
@@ -83,6 +95,28 @@
force=false/
/page
page
+ ifProperty=${online}+=1
+ type=input
+ name=Directories
+ displayText=Path to freenet
+ comment
+ displayText=Select the location of freenet core
files/
+ comment
+ displayText=BE CAREFULL : we can't ensure they are
valid nor up to date/
+ file
+ property=freenet-cvs-snapshot.location
+ defaultValue=/path/to/freenet-cvs-snapshot.jar
+ displayText=Freenet core file :
+ checkExists=true
+ create=false/
+ file
+ property=freenet-ext.location
+ defaultValue=/path/to/freenet-ext.jar
+ displayText=Freenet additionnal :
+ checkExists=true
+ create=false/
+ /page
+ page
ifProperty=${l33t}+=1
type=input
name=selector
Modified: trunk/apps/installer/build.xml
===
--- trunk/apps/installer/build.xml 2006-04-05 19:55:47 UTC (rev 8471)
+++ trunk/apps/installer/build.xml 2006-04-05 20:38:01 UTC (rev 8472)
@@ -27,6 +27,9 @@
condition property=is_testnet value=true
istrue value=${enableTestnet} /
/condition
+ condition property=offline value=true
+ equals arg1=${online} arg2=1/
+ /condition
/target
target name=darknet if=is_darknet
@@ -118,7 +121,7 @@
/replace
/target
- target name=default
depends=pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,jSite,start_browser
+ target name=default
depends=pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,offline,frost,jSite,start_browser
/target
target name=copy
@@ -135,9 +138,10 @@
replacefilter token=@serviceName@
value=freenet-${freenetWorkingMode}/
replacefilter token=@testnet@
value=${freenetWorkingMode}/
/replace
- copy file=${basedir}/freenet-cvs-snapshot.jar
tofile=${installDir}/freenet-cvs-snapshot.jar/
- copy file=${basedir}/freenet-ext.jar
tofile=${installDir}/freenet-ext.jar/
-
+ copy file=${basedir}/freenet-cvs-snapshot.jar
tofile=${installDir}/freenet-cvs-snapshot.jar failonerror=false/
+
[freenet-cvs] r8473 - trunk/apps/installer
Author: nextgens Date: 2006-04-05 21:00:22 + (Wed, 05 Apr 2006) New Revision: 8473 Modified: trunk/apps/installer/antinstall-config.xml Log: installer: some tunning has been done to improve the look and feel Modified: trunk/apps/installer/antinstall-config.xml === --- trunk/apps/installer/antinstall-config.xml 2006-04-05 20:38:01 UTC (rev 8472) +++ trunk/apps/installer/antinstall-config.xml 2006-04-05 21:00:22 UTC (rev 8473) @@ -1,13 +1,14 @@ ?xml version=1.0? !DOCTYPE installer PUBLIC -//tp23 //DTD Ant Installer Config//EN http://antinstaller.sf.net/dtd/antinstall-config-0.7.dtd; installer - ui=swing,text - verbose=true - lookAndFeel=org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel + ui=text,swing + verbose=false + lookAndFeel=jgoodies name=Freenet 0.7 Installer windowIcon=/resources/icon.png defaultImageResource=/resources/title.png - minJavaVersion=1.4 + minJavaVersion=1.4 + antialiased=true !-- each page element represents a page of the installer -- page type=input ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
[freenet-cvs] r8477 - trunk/website/pages
Author: bob Date: 2006-04-05 22:39:56 + (Wed, 05 Apr 2006) New Revision: 8477 Modified: trunk/website/pages/download-new.php Log: Changed link to new 0.7 wrapper, which only downloads Java if it needs it (rather than always being bundled with it and therefore rather large.) Old wrapper is still there in case of problems. Modified: trunk/website/pages/download-new.php === --- trunk/website/pages/download-new.php2006-04-05 22:22:29 UTC (rev 8476) +++ trunk/website/pages/download-new.php2006-04-05 22:39:56 UTC (rev 8477) @@ -20,7 +20,8 @@ for some info./i BR nbsp;BR h3Windows/h3 -- Download and run biga href=http://downloads.freenetproject.org/freenet-pre-07-alpha.exe;freenet-webinstall/a/bigbr +- Download and run biga href=http://downloads.freenetproject.org/freenet-pre-07-alpha-nojava.exe;freenet-webinstall/a/bigbr + !-- Old wrapper : http://downloads.freenetproject.org/freenet-pre-07-alpha.exe -- br It will automatically install Freenet and other required components for you. When done, your default browser will automatically open up to Freenet's web-based user interface. br (Freenet contains ubNO spyware or adware/b/u , it's Free Software! The source code is publicly available for review) BR ___ cvs mailing list cvs@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
