[freenet-dev] Wininstaller NSIS diffs as attachments
By request since emailing inline introduced nasty formatting. Bob ___ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com -- next part -- A non-text attachment was scrubbed... Name: Update.nsi.diff Type: application/octet-stream Size: 1028 bytes Desc: 1071796387-Update.nsi.diff URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20051105/38327a1b/attachment.obj> -- next part -- A non-text attachment was scrubbed... Name: freenet-java.nsi.diff Type: application/octet-stream Size: 580 bytes Desc: 875061740-freenet-java.nsi.diff URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20051105/38327a1b/attachment-0001.obj> -- next part -- A non-text attachment was scrubbed... Name: freenet-modern.nsi.diff Type: application/octet-stream Size: 4310 bytes Desc: 765338266-freenet-modern.nsi.diff URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20051105/38327a1b/attachment-0002.obj>
[freenet-dev] NSIS diffs for improved wininstaller (was : freenet-java-webinstall.exe still bundled with J2RE 1.4.1_03??)
Also, we have a new location for binaries on emu, if sourceforge is going to continue to be awkward (freenet.jar and freenet-ext.jar are nearly 2MB each)... maybe you can make the installer alternate between the two? http://emu.freenetproject.org/downloads/ http://emu.freenetproject.org/downloads/seednodes/ And the sourceforge-hosted site: http://freenetproject.org/snapshots/ Hmm, having said that... I'm not sure we have what we want there... We should have stable and unstable jar's, at least... nextgens? On Sat, Nov 05, 2005 at 05:59:36PM +, toad wrote: > Do you have SVN write access? I'd be quite happy to give you it; all > commits are monitored on the cvs mailing list; then you can commit your > changes and teach me how to build the new EXEs. > > Send me a nym and an initial password, and an email address for your CVS > commits to appear to come from. -- Matthew J Toseland - toad at amphibian.dyndns.org Freenet Project Official Codemonkey - http://freenetproject.org/ ICTHUS - Nothing is impossible. Our Boss says so. -- next part -- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: Digital signature URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20051105/f68ab861/attachment.pgp>
[freenet-dev] Re: NSIS diffs for improved wininstaller (was : freenet-java-webinstall.exe still bundled with J2RE 1.4.1_03??)
OK, here are the UNOFFICIAL installers FROM AN UNSAFE SOURCE if anyone wants to test them. * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * 'cruise' or indeed ANYONE ELSE since he publically posted the user:pass (email might have been a better idea ;) could potentially change/trojan etc these exe's, so if you want to use them you *MUST* verify the md5sums!! I will NOT be held responsible if you don't do this and get hacked or worse. You can get a windows md5sum from here : http://www.md5summer.org/download.html Here they are : webinstaller with embedded Java. For people who don't have Java, but please feel free to uninstall your Java temporarily and test it works :) = MD5Sum : d9b594ddfc5bb2d2343c9845989e9e96 freenet-Java-Webinstall_Unofficial.exe Server size/timestamp as seen via Firefox : 15843 KB 11/05/05 01:14:00 Same as seen via Linux FTP shell : 16222519 Nov 05 01:14 freenet-Java-Webinstall_Unofficial.exe ftp://parkour:parkour at harlequin.casual-tempest.net/media/ freenet-Java-Webinstall_Unofficial.exe . "Normal" webinstaller For people who already have Java installed = MD5Sum : a64631f7d8040d706ca35f7d5b094309 freenet-webinstall_Unofficial.exe Server size/timestamp as seen via Firefox : 282 KB 11/05/05 01:17:00 Same as seen via Linux FTP shell : 288621 Nov 05 01:17 freenet-webinstall_Unofficial.exe ftp://parkour:parkour at harlequin.casual-tempest.net/media/ freenet-webinstall_Unofficial.exe . * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * * IMPORTANT! * Once again, VERIFY THE MD5's OR THESE MIGHT FORMAT YOUR DRIVE OR ROOTKIT YOU!! Bob
[freenet-dev] NSIS diffs for improved wininstaller (was : freenet-java-webinstall.exe still bundled with J2RE 1.4.1_03??)
OK, here's the diffs. With wonderful timing, my boot
drive died just as I was
finishing up :( I did the old stick-it-in-the-freezer
trick and it's working
again for now.
Anyway, because of this they're not quite perfect
(still have the "can try and
download JRE from snapshots" issue, not that this is
particularly likely to crop
up) but other than that they seem to work quite well.
I will attempt to upload the UNOFFICIAL exe's to the
FTP mentioned upthread too
for anyone who wants to test them.
--- freenet-modern.nsi_ORIG 2005-11-05
00:21:30.0 +
+++ freenet-modern.nsi 2005-11-05 00:01:00.0
+
@@ -26,7 +26,7 @@
!define PRODUCT_NAME "Freenet"
!define WEBINSTALL # the default install type
!define BUILDDATE 20041124
-!define JAVAINSTALLER "jre-win32-latest.exe"
+# !define JAVAINSTALLER "jre-win32-latest.exe"
!ifdef WEBINSTALL
!define PRODUCT_VERSION "Webinstall"
@@ -165,6 +165,8 @@
GetFullPathName /SHORT $2 $EXEDIR # same for EXEDIR
into $2
GetFullPathName /SHORT $R0 $TEMP # same for TEMP
into $R0
+# MessageBox MB_OK "Temp is $R0, Exedir is $2"
+
# make sure the files we're downloading don't
already exist in the temp dir:
SetDetailsPrint none
Delete "$R0\freenet-install\*.*"
@@ -344,10 +346,10 @@
IfFileExists "$R0\freenet-install\seednodes.ref"
NoDownloadSeednodes
# if "Don't Prompt Me" is selected the following
message box will not appear
and seed download will be automatic
# ###TODO
- MessageBox MB_YESNO "To connect to the Freenet
network, your Freenet node
needs to know about at least one other Freenet
node.$\r$\nThis is called a 'Node
Reference' or 'seednodes.ref' file.$\r$\nDo you want
to download 'seednodes.ref'
from the Free Net Project's servers?$\r$\nYou may want
to say NO if you have
been given a .ref file by a friend,$\r$\nor if you
have installed Freenet before
and still have the file named seednodes.ref" IDNO
NoDownloadSeedNodes
- Push
"http://freenetproject.org/snapshots/seednodes.ref;
+ MessageBox MB_YESNO "To connect to the Freenet
network, your Freenet node
needs to know about at least one other Freenet
node.$\r$\nThis is called a 'Node
Reference' or 'seednodes.ref' file.$\r$\nDo you want
to download a compressed
'seednodes.ref' from the Free Net Project's
servers?$\r$\nYou may want to say NO
if you have been given a .ref file by a
friend,$\r$\nor if you have installed
Freenet before and still have the file named
seednodes.ref" IDNO NoDownloadSeedNodes
+ Push
"http://freenetproject.org/snapshots/seednodes.zip;
Push "$R0\freenet-install"
- Push "seednodes.ref"
+ Push "seednodes.zip"
Call RetryableDownload
StrCmp $0 "success" seedsuccess
MessageBox MB_YESNO "Couldn't download seednodes.ref
- Without this file
Freenet will not work.$\r$\nDo you want to continue
installation anyway? (You
will still need to download seednodes.ref yourself)"
IDYES NoDownloadSeedNodes
@@ -356,6 +358,8 @@
seedsuccess:
ClearErrors
+# Should have seednodes.zip if we're here
+
NoDownloadSeedNodes:
StrCmp "$3" "${NUMBER_OF_DOWNLOADABLE_FILES}"
DoneGettingFiles
@@ -409,6 +413,28 @@
File update\UpdateSnapshot.exe
IfErrors DiskWriteError
+
+IfFileExists "$INSTDIR\seednodes.zip" unzipSeednodes
+
+# If we haven't got it for some reason, jump to error
handler
+goto unzipSeednodesDownloadError
+
+# Bob H : We've got seednodes, unzip them
+# We must run before NodeConfig, or it will
"helpfully" go and download the
uncompressed seednodes.ref itself without asking!
+unzipSeednodes:
+DetailPrint "Decompressing seednodes, please wait
..."
+ # We extract it to temp install dir first, to stop
NodeConfig downloading
seednodes.ref
+ZipDLL::extractall
"$R0\freenet-install\seednodes.zip"
"$R0\freenet-install"
+ # Then copy to final install dir
+CopyFiles "$R0\freenet-install\seednodes.ref"
"$INSTDIR"
+ goto seednodesUnzipped
+
+unzipSeednodesDownloadError:
+MessageBox MB_OK "Sorry, the compressed seednodes
'seednodes.zip' could not be
found.$\r$\nA seednodes file is needed for freenet to
work.$\r$\nYou could try
downloading seednodes manually from :$\r$\n
http://freenetproject.org/snapshots/;
+
+seednodesUnzipped:
+
+
# Step 3- Merge ini files
# Step 3a - create a default .ini file
IfFileExists "$INSTDIR\default.ini" 0
NoFreenetIniDefaults
@@ -582,6 +608,8 @@
Delete "$INSTDIR\flaunch.ini"
Delete "$INSTDIR\freenet.ini"
Delete "$INSTDIR\seednodes.ref"
+# Bob H : Cleanup zipped seednodes too
+ Delete "$INSTDIR\seednodes.zip"
Delete "$INSTDIR\prng.seed"
RMDir /r "$INSTDIR\store"
Delete "$INSTDIR\lsnodes*"
@@ -694,6 +722,7 @@
SetOutPath "$R0\freenet-install"
SetDetailsPrint both
+
!ifdef embedJava
# Install Java runtime only if not found
--- freenet-java.nsi_ORIG 2005-11-05
00:21:55.0 +
+++ freenet-java.nsi2005-11-04 22:17:42.0
+
@@ -10,7 +10,10 @@
# You still need to add the javaexecutable yourself
# Created April 2001 by David McNab and
Re: [freenet-dev] NSIS diffs for improved wininstaller (was : freenet-java-webinstall.exe still bundled with J2RE 1.4.1_03??)
Can you resend those patches as attachments, some of the hunks fail
(probably due to email formatting).
When I get my local copy patched I'll have a stab at it with sharp
implements and rebuild+upload it.
Matt
Bob wrote:
OK, here's the diffs. With wonderful timing, my boot
drive died just as I was
finishing up :( I did the old stick-it-in-the-freezer
trick and it's working
again for now.
Anyway, because of this they're not quite perfect
(still have the can try and
download JRE from snapshots issue, not that this is
particularly likely to crop
up) but other than that they seem to work quite well.
I will attempt to upload the UNOFFICIAL exe's to the
FTP mentioned upthread too
for anyone who wants to test them.
--- freenet-modern.nsi_ORIG 2005-11-05
00:21:30.0 +
+++ freenet-modern.nsi 2005-11-05 00:01:00.0
+
@@ -26,7 +26,7 @@
!define PRODUCT_NAME Freenet
!define WEBINSTALL # the default install type
!define BUILDDATE 20041124
-!define JAVAINSTALLER jre-win32-latest.exe
+# !define JAVAINSTALLER jre-win32-latest.exe
!ifdef WEBINSTALL
!define PRODUCT_VERSION Webinstall
@@ -165,6 +165,8 @@
GetFullPathName /SHORT $2 $EXEDIR # same for EXEDIR
into $2
GetFullPathName /SHORT $R0 $TEMP # same for TEMP
into $R0
+# MessageBox MB_OK Temp is $R0, Exedir is $2
+
# make sure the files we're downloading don't
already exist in the temp dir:
SetDetailsPrint none
Delete $R0\freenet-install\*.*
@@ -344,10 +346,10 @@
IfFileExists $R0\freenet-install\seednodes.ref
NoDownloadSeednodes
# if Don't Prompt Me is selected the following
message box will not appear
and seed download will be automatic
# ###TODO
- MessageBox MB_YESNO To connect to the Freenet
network, your Freenet node
needs to know about at least one other Freenet
node.$\r$\nThis is called a 'Node
Reference' or 'seednodes.ref' file.$\r$\nDo you want
to download 'seednodes.ref'
from the Free Net Project's servers?$\r$\nYou may want
to say NO if you have
been given a .ref file by a friend,$\r$\nor if you
have installed Freenet before
and still have the file named seednodes.ref IDNO
NoDownloadSeedNodes
- Push
http://freenetproject.org/snapshots/seednodes.ref;
+ MessageBox MB_YESNO To connect to the Freenet
network, your Freenet node
needs to know about at least one other Freenet
node.$\r$\nThis is called a 'Node
Reference' or 'seednodes.ref' file.$\r$\nDo you want
to download a compressed
'seednodes.ref' from the Free Net Project's
servers?$\r$\nYou may want to say NO
if you have been given a .ref file by a
friend,$\r$\nor if you have installed
Freenet before and still have the file named
seednodes.ref IDNO NoDownloadSeedNodes
+ Push
http://freenetproject.org/snapshots/seednodes.zip;
Push $R0\freenet-install
- Push seednodes.ref
+ Push seednodes.zip
Call RetryableDownload
StrCmp $0 success seedsuccess
MessageBox MB_YESNO Couldn't download seednodes.ref
- Without this file
Freenet will not work.$\r$\nDo you want to continue
installation anyway? (You
will still need to download seednodes.ref yourself)
IDYES NoDownloadSeedNodes
@@ -356,6 +358,8 @@
seedsuccess:
ClearErrors
+# Should have seednodes.zip if we're here
+
NoDownloadSeedNodes:
StrCmp $3 ${NUMBER_OF_DOWNLOADABLE_FILES}
DoneGettingFiles
@@ -409,6 +413,28 @@
File update\UpdateSnapshot.exe
IfErrors DiskWriteError
+
+IfFileExists $INSTDIR\seednodes.zip unzipSeednodes
+
+# If we haven't got it for some reason, jump to error
handler
+goto unzipSeednodesDownloadError
+
+# Bob H : We've got seednodes, unzip them
+# We must run before NodeConfig, or it will
helpfully go and download the
uncompressed seednodes.ref itself without asking!
+unzipSeednodes:
+DetailPrint Decompressing seednodes, please wait
...
+ # We extract it to temp install dir first, to stop
NodeConfig downloading
seednodes.ref
+ZipDLL::extractall
$R0\freenet-install\seednodes.zip
$R0\freenet-install
+ # Then copy to final install dir
+CopyFiles $R0\freenet-install\seednodes.ref
$INSTDIR
+ goto seednodesUnzipped
+
+unzipSeednodesDownloadError:
+MessageBox MB_OK Sorry, the compressed seednodes
'seednodes.zip' could not be
found.$\r$\nA seednodes file is needed for freenet to
work.$\r$\nYou could try
downloading seednodes manually from :$\r$\n
http://freenetproject.org/snapshots/;
+
+seednodesUnzipped:
+
+
# Step 3- Merge ini files
# Step 3a - create a default .ini file
IfFileExists $INSTDIR\default.ini 0
NoFreenetIniDefaults
@@ -582,6 +608,8 @@
Delete $INSTDIR\flaunch.ini
Delete $INSTDIR\freenet.ini
Delete $INSTDIR\seednodes.ref
+# Bob H : Cleanup zipped seednodes too
+ Delete $INSTDIR\seednodes.zip
Delete $INSTDIR\prng.seed
RMDir /r $INSTDIR\store
Delete $INSTDIR\lsnodes*
@@ -694,6 +722,7 @@
SetOutPath $R0\freenet-install
SetDetailsPrint both
+
!ifdef embedJava
# Install Java runtime only if not found
--- freenet-java.nsi_ORIG 2005-11-05
00:21:55.0 +
+++
[freenet-dev] Wininstaller NSIS diffs as attachments
By request since emailing inline introduced nasty formatting. Bob ___ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com Update.nsi.diff Description: 1071796387-Update.nsi.diff freenet-java.nsi.diff Description: 875061740-freenet-java.nsi.diff freenet-modern.nsi.diff Description: 765338266-freenet-modern.nsi.diff ___ Devl mailing list Devl@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
[freenet-dev] Re: Wininstaller NSIS diffs as attachments
These should now be committed to subversion. Bob ___ Devl mailing list Devl@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
