Just to avoid confusion: Both the language the installer is written in (AHK) and the installer code that I wrote is open-source. The ongoing debates are about third-party tools used during the build and installation processes.
- Zero3 Ian Clarke skrev: > I don't know that this is such a big deal. I mean, I'd happily use a > closed source installer if it made installation easier. > > It is important to keep the core software free, but I think we can be > less stringent about installers - since it will always be possible to > get Freenet running with a completely open source stack, but using > something closed source to provide an easier option is reasonable > IMHO. > > Ian. > > On Sat, Jan 31, 2009 at 10:35 AM, Matthew Toseland > <[email protected]> wrote: > >> Using unmaintained freeware in the build process is unacceptable. >> >> Source is available for XN Resource Editor, is there a command line version? >> >> http://www.wilsonc.demon.co.uk/d10resourceeditor.htm >> >> Also, RemProf.exe is freeware and not maintained and source code will not be >> made available, and we use that at install time. >> >> Do we use any freeware utilities in the current java installer? I think maybe >> there was one...? If so, maybe it's an acceptable risk, but it should be >> minimised nonetheless - what we need most urgently are UAC-escalated >> start/stop exe's for the java installer. >> >> On Wednesday 28 January 2009 02:16, [email protected] wrote: >> >>> Author: Zero3 >>> Date: 2009-01-28 02:16:10 +0000 (Wed, 28 Jan 2009) >>> New Revision: 25345 >>> >>> Added: >>> trunk/apps/wininstaller/compiler/ResHack_Resource_Icon_Freenet.ico >>> trunk/apps/wininstaller/compiler/ResHack_Resource_Manifest_Vista.txt >>> trunk/apps/wininstaller/compiler/ResHack_Script_Normal.txt >>> trunk/apps/wininstaller/compiler/ResHack_Script_VistaElevated.txt >>> Removed: >>> trunk/apps/wininstaller/compiler/AutoHotkeySC_Normal.bin >>> trunk/apps/wininstaller/compiler/AutoHotkeySC_VistaElevated.bin >>> Modified: >>> trunk/apps/wininstaller/BuildAll.cmd >>> Log: >>> Replaced pre-patched AHK bins with patching script >>> >>> Modified: trunk/apps/wininstaller/BuildAll.cmd >>> =================================================================== >>> --- trunk/apps/wininstaller/BuildAll.cmd 2009-01-28 02:15:18 UTC (rev >>> 25344) >>> +++ trunk/apps/wininstaller/BuildAll.cmd 2009-01-28 02:16:10 UTC (rev >>> 25345) >>> @@ -1,25 +1,32 @@ >>> @echo off >>> :: >>> -:: Not-committed requirements: >>> -:: - bin\freenet.jar >>> -:: - bin\freenet-ext.jar >>> -:: - bin\Ahk2Exe.exe (AutoHotKey compiler) >>> -:: - bin\upx.exe (UPX packer, comes with AutoHotKey compiler) >>> -:: - bin\JSTUN.jar >>> -:: - bin\KeyExplorer.jar >>> -:: - bin\ThawIndexBrowser.jar >>> -:: - bin\UPnP.jar >>> -:: - bin\XMLLibrarian.jar >>> +:: Non-committed requirements: >>> :: >>> +:: - bin\Ahk2Exe.exe (AutoHotkey compiler - http://www.autohotkey.com/) >>> +:: - bin\upx.exe (UPX packer, comes with AutoHotkey compiler) >>> +:: - bin\AutoHotkeySC.bin (AHK library, comes with AutoHotkey compiler) >>> +:: >>> +:: - bin\ResHacker.exe (Resource Hacker - >>> >> http://angusj.com/resourcehacker/) >> >>> +:: >>> +:: - bin\freenet.jar (Freenet jar) >>> +:: - bin\freenet-ext.jar (Freenet jar) >>> +:: >>> +:: - bin\JSTUN.jar (Freenet plugin jar) >>> +:: - bin\KeyExplorer.jar (Freenet plugin jar) >>> +:: - bin\ThawIndexBrowser.jar (Freenet plugin jar) >>> +:: - bin\UPnP.jar (Freenet plugin jar) >>> +:: - bin\XMLLibrarian.jar (Freenet plugin jar) >>> +:: >>> >>> :: >>> :: Cleanup and prepare >>> :: >>> -if exist bin\FreenetInstaller.exe del bin\FreenetInstaller.exe /Q >>> +if exist bin\FreenetInstaller.exe del bin\FreenetInstaller.exe >>> copy bin\freenet.jar src_freenetinstaller\files_install\freenet.jar >>> copy bin\freenet-ext.jar src_freenetinstaller\files_install\freenet-ext.jar >>> copy bin\Ahk2Exe.exe compiler\Ahk2Exe.exe >>> copy bin\upx.exe compiler\upx.exe >>> +copy bin\ResHacker.exe compiler\ResHacker.exe >>> copy bin\JSTUN.jar src_freenetinstaller\files_install\plugins\JSTUN.jar >>> copy bin\KeyExplorer.jar >>> >> src_freenetinstaller\files_install\plugins\KeyExplorer.jar >> >>> copy bin\ThawIndexBrowser.jar >>> >> src_freenetinstaller\files_install\plugins\ThawIndexBrowser.jar >> >>> @@ -27,9 +34,21 @@ >>> copy bin\XMLLibrarian.jar >>> >> src_freenetinstaller\files_install\plugins\XMLLibrarian.jar >> >>> :: >>> +:: Patch AHK library >>> +:: >>> +copy bin\AutoHotkeySC.bin compiler\AutoHotkeySC.bin >>> +cd compiler >>> + >>> +ResHacker.exe -script ResHack_Script_Normal.txt >>> +ResHacker.exe -script ResHack_Script_VistaElevated.txt >>> + >>> +cd .. >>> +del compiler\AutoHotkeySC.bin >>> + >>> +:: >>> :: Compile non-Vista-elevated executables >>> :: >>> -copy compiler\AutoHotkeySC_Normal.bin compiler\AutoHotkeySC.bin >>> +move /Y compiler\AutoHotkeySC_Normal.bin compiler\AutoHotkeySC.bin >>> >>> >>> >> compiler\Ahk2Exe.exe /in "src_freenethelpers\FreenetLauncher.ahk" /out >> "src_freenetinstaller\files_install\freenetlauncher.exe" >> >>> @@ -38,7 +57,7 @@ >>> :: >>> :: Compile Vista-elevated executables >>> :: >>> -copy compiler\AutoHotkeySC_VistaElevated.bin compiler\AutoHotkeySC.bin >>> +move /Y compiler\AutoHotkeySC_VistaElevated.bin compiler\AutoHotkeySC.bin >>> >>> >>> >> compiler\Ahk2Exe.exe /in >> "src_freenetinstaller\FreenetInstaller_Uninstaller.ahk" /out >> "src_freenetinstaller\files_install\bin\freenetuninstaller.exe" >> >> compiler\Ahk2Exe.exe /in "src_freenethelpers\FreenetStart.ahk" /out >> "src_freenetinstaller\files_install\bin\start.exe" >> >>> @@ -53,6 +72,10 @@ >>> :: >>> del compiler\Ahk2Exe.exe >>> del compiler\upx.exe >>> +del compiler\ResHacker.exe >>> +del compiler\ResHacker.ini >>> +del compiler\ResHack_Log_Normal.txt >>> +del compiler\ResHack_Log_VistaElevated.txt >>> del src_freenetinstaller\files_install\freenet.jar >>> del src_freenetinstaller\files_install\freenet-ext.jar >>> del src_freenetinstaller\files_install\freenetlauncher.exe >>> >>> Deleted: trunk/apps/wininstaller/compiler/AutoHotkeySC_Normal.bin >>> =================================================================== >>> (Binary files differ) >>> >>> Deleted: trunk/apps/wininstaller/compiler/AutoHotkeySC_VistaElevated.bin >>> =================================================================== >>> (Binary files differ) >>> >>> Added: trunk/apps/wininstaller/compiler/ResHack_Resource_Icon_Freenet.ico >>> =================================================================== >>> (Binary files differ) >>> >>> >>> Property changes on: >>> >> trunk/apps/wininstaller/compiler/ResHack_Resource_Icon_Freenet.ico >> >>> ___________________________________________________________________ >>> Added: svn:mime-type >>> + application/octet-stream >>> >>> Added: trunk/apps/wininstaller/compiler/ResHack_Resource_Manifest_Vista.txt >>> =================================================================== >>> --- trunk/apps/wininstaller/compiler/ResHack_Resource_Manifest_Vista.txt >>> >> (rev 0) >> >>> +++ trunk/apps/wininstaller/compiler/ResHack_Resource_Manifest_Vista.txt >>> >> 2009-01-28 02:16:10 UTC (rev 25345) >> >>> @@ -0,0 +1,28 @@ >>> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> >>> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> >>> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> >>> + <security> >>> + <requestedPrivileges> >>> + <requestedExecutionLevel level="requireAdministrator" >>> >> uiAccess="false"/> >> >>> + </requestedPrivileges> >>> + </security> >>> +</trustInfo> >>> +<assemblyIdentity >>> + version="1.0.47.06" >>> + processorArchitecture="X86" >>> + name="Microsoft.Windows.AutoHotkey" >>> + type="win32" >>> +/> >>> +<dependency> >>> + <dependentAssembly> >>> + <assemblyIdentity >>> + type="win32" >>> + name="Microsoft.Windows.Common-Controls" >>> + version="6.0.0.0" >>> + processorArchitecture="X86" >>> + publicKeyToken="6595b64144ccf1df" >>> + language="*" >>> + /> >>> + </dependentAssembly> >>> +</dependency> >>> +</assembly> >>> >>> Added: trunk/apps/wininstaller/compiler/ResHack_Script_Normal.txt >>> =================================================================== >>> --- trunk/apps/wininstaller/compiler/ResHack_Script_Normal.txt >>> >> (rev 0) >> >>> +++ trunk/apps/wininstaller/compiler/ResHack_Script_Normal.txt >>> 2009-01-28 >>> >> 02:16:10 UTC (rev 25345) >> >>> @@ -0,0 +1,16 @@ >>> +[FILENAMES] >>> +Exe=AutoHotkeySC.bin >>> +SaveAs=AutoHotkeySC_Normal.bin >>> +Log=ResHack_Log_Normal.txt >>> + >>> +[COMMANDS] >>> +-delete MENU,, >>> +-delete ACCELERATORS,, >>> +-addoverwrite ResHack_Resource_Icon_Freenet.ico,ICONGROUP,159, >>> +-delete ICONGROUP,160, >>> +-delete ICONGROUP,206, >>> +-delete ICONGROUP,207, >>> +-delete ICONGROUP,208, >>> +-delete ICONGROUP,228, >>> +-delete ICONGROUP,229, >>> +-delete VERSIONINFO,1, >>> >>> Added: trunk/apps/wininstaller/compiler/ResHack_Script_VistaElevated.txt >>> =================================================================== >>> --- trunk/apps/wininstaller/compiler/ResHack_Script_VistaElevated.txt >>> >> (rev 0) >> >>> +++ trunk/apps/wininstaller/compiler/ResHack_Script_VistaElevated.txt >>> >> 2009-01-28 02:16:10 UTC (rev 25345) >> >>> @@ -0,0 +1,17 @@ >>> +[FILENAMES] >>> +Exe=AutoHotkeySC.bin >>> +SaveAs=AutoHotkeySC_VistaElevated.bin >>> +Log=ResHack_Log_VistaElevated.txt >>> + >>> +[COMMANDS] >>> +-delete MENU,, >>> +-delete ACCELERATORS,, >>> +-addoverwrite ResHack_Resource_Icon_Freenet.ico,ICONGROUP,159, >>> +-delete ICONGROUP,160, >>> +-delete ICONGROUP,206, >>> +-delete ICONGROUP,207, >>> +-delete ICONGROUP,208, >>> +-delete ICONGROUP,228, >>> +-delete ICONGROUP,229, >>> +-delete VERSIONINFO,1, >>> +-addoverwrite ResHack_Resource_Manifest_Vista.txt,24,1, >>> \ No newline at end of file >>> >>> _______________________________________________ >>> cvs mailing list >>> [email protected] >>> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs >>> >>> >>> >> _______________________________________________ >> Devl mailing list >> [email protected] >> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl >> >> > > > > _______________________________________________ Devl mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
