From: <yu...@us...> - 2008-02-14 16:27:46
|
Revision: 2839 http://hugin.svn.sourceforge.net/hugin/?rev=2839&view=rev Author: yuv Date: 2008-02-14 08:06:27 -0800 (Thu, 14 Feb 2008) Log Message: ----------- updated installer Modified Paths: -------------- hugin/trunk/platforms/windows/installer/CMakeLists.txt hugin/trunk/platforms/windows/installer/Release_Notes.txt hugin/trunk/platforms/windows/installer/hugin.iss hugin/trunk/platforms/windows/installer/installer_license.txt Modified: hugin/trunk/platforms/windows/installer/CMakeLists.txt =================================================================== --- hugin/trunk/platforms/windows/installer/CMakeLists.txt 2008-02-14 15:46:23 UTC (rev 2838) +++ hugin/trunk/platforms/windows/installer/CMakeLists.txt 2008-02-14 16:06:27 UTC (rev 2839) @@ -1,4 +1,19 @@ IF (WIN32) + SET (HUGIN_BUILDER "" CACHE STRING + "set Builder Name." + ) + IF(NOT HUGIN_BUILDER) + MESSAGE(FATAL_ERROR "Need to set builder (HUGIN_BUILDER) manually") + ENDIF(NOT HUGIN_BUILDER) + + SET (HUGIN_BUILDDATE "" CACHE STRING + "set Build Date." + ) + IF(NOT HUGIN_BUILDDATE) + MESSAGE(FATAL_ERROR "Need to set build date (HUGIN_BUILDDATE) manually") + ENDIF(NOT HUGIN_BUILDDATE) + + # InnoSetup installer files # using @VAR@ for substituion because ${VAR} might interfere with InnoSetup's own syntax CONFIGURE_FILE(hugin.iss ${CMAKE_INSTALL_PREFIX}/../hugin.iss) Modified: hugin/trunk/platforms/windows/installer/Release_Notes.txt =================================================================== --- hugin/trunk/platforms/windows/installer/Release_Notes.txt 2008-02-14 15:46:23 UTC (rev 2838) +++ hugin/trunk/platforms/windows/installer/Release_Notes.txt 2008-02-14 16:06:27 UTC (rev 2839) @@ -5,14 +5,12 @@ REQUEST FOR TESTING: -autopano-sift-c needs testing. it most likely does not work from hugin -but should work from the command line. +there are two new variations of autopano-sift-c that need testing. +APSC is a standalone C program, while autopano-c-complete.exe is +a compiled Perl script that replicates autopano-c-complete.sh from +the other platforms. autopano-c-complete.vbs is still included for +the record but deprecated. -please start a command prompt. cd into a folder with the images to align -enter the following command: - -autopano-c-complete.vbs --points 20 -o test.pto img1.jpg img2.jpg ... - try with a large number of images. reports success or failure back to <http://groups.google.com/group/hugin-ptx/> @@ -21,12 +19,12 @@ KNOWN ISSUES: * enfuse zenith and nadir blending -* autopano-c-complete does not work from hugin RECENT CHANGES/BUGFIXES: * installer can now clean hugin's registry entries on install but not on uninstall (to avoid removing user's preferences) -* fixed bug in autopano-sift-c +* installer can now set some default settings (experimental) + Modified: hugin/trunk/platforms/windows/installer/hugin.iss =================================================================== --- hugin/trunk/platforms/windows/installer/hugin.iss 2008-02-14 15:46:23 UTC (rev 2838) +++ hugin/trunk/platforms/windows/installer/hugin.iss 2008-02-14 16:06:27 UTC (rev 2839) @@ -1,4 +1,5 @@ ; Hugin InnoSetup Installer File +; (C) 2008 Yuval Levy, licensed under GPL V2 ; if possible, let the Make process edit AppVerName to have a proper, automated SVN numbering ; make sure that the Make process copies this file from platforms/windows/msi to INSTALL/ ; and that it also copes the files win_installer_readme.txt and win_release_notes.txt to INSTALL/ @@ -9,10 +10,10 @@ ; ApId is checked to determine wheter to append to a particular existing uninstall log ; keep it the same for updates of the same installation AppId=Hugin_alpha_builds -AppVerName=Hugin 0.7.0.@HUGIN_WC_REVISION@SVN-Yuv +AppVerName=Hugin 0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ AppPublisher=Yuv AppPublisherURL=http://panospace.wordpress.com/ -AppVersion=0.7.0.@HUGIN_WC_REVISION@SVN-Yuv +AppVersion=0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ AppSupportURL=http://tech.groups.yahoo.com/group/PanoToolsNG/ AppUpdatesURL=http://groups.google.com/group/hugin-ptx ; necessary to create file associations @@ -43,10 +44,14 @@ WizardSmallImageFile=smallimage.bmp WizardImageStretch=no WizardImageFile=wizardimage.bmp +; compression: solid compression only recommended for smaller (<100MB) +; test it to see if it is significantly better +Compression=lzma/ultra +SolidCompression=yes [Types] -Name: "default"; Description: "Default installation (w/o Autopano)" +Name: "default"; Description: "Default installation (Autopano Perl)" Name: "full"; Description: "Full installation" Name: "enblend"; Description: "Enblend/Enfuse and helper files/droplets only" Name: "photoshop"; Description: "Photoshop Plugins only (not available yet)" @@ -54,85 +59,93 @@ Name: "custom"; Description: "Custom installation (recommended for testing)"; Flags: iscustom [Components] -Name: "core"; Description: "Hugin"; Types: default full custom; Flags: fixed -Name: "translations"; Description: "Hugin Language Pack"; Types: default full custom; -Name: "enblend"; Description: "Enblend/Enfuse"; Types: default full enblend custom; -Name: "autopano"; Description: "Autopano-SIFT-C (Patent issues in the USA!)"; Types: full custom; -Name: "panotools"; Description: "Panotools CLI Tools (N/A yet)"; Types: default full custom; -Name: "photoshop"; Description: "Photoshop Plugins (N/A yet)"; Types: full photoshop custom; -Name: "gimp"; Description: "Gimp Plugins (N/A yet)"; Types: full gimp custom; +Name: "core"; Description: "Hugin"; Types: default full custom; Flags: fixed +Name: "translations"; Description: "Hugin Language Pack"; Types: default full custom; +Name: "enblend"; Description: "Enblend/Enfuse"; Types: default full enblend custom; +Name: "ap_vbs"; Description: "Autopano-SIFT VBS (Patent issues in the USA!)"; Types: full custom; +Name: "ap_p"; Description: "Autopano-SIFT Perl (Patent issues in the USA!)"; Types: default custom; +Name: "ap_c"; Description: "Autopano-SIFT APSC (Patent issues in the USA!)"; Types: full custom; +Name: "panotools"; Description: "Panotools Command Line Tools"; Types: default full custom; +Name: "photoshop"; Description: "Photoshop Plugins (N/A yet)"; Types: full photoshop custom; +Name: "gimp"; Description: "Gimp Plugins (N/A yet)"; Types: full gimp custom; ; not necessary (if the directory is not empty) but clean [Dirs] ; bin is not read-only because we may want to customize the droplets Name: "{app}\bin" -Name: "{app}\doc"; Attribs: readonly; -Name: "{app}\share"; Attribs: hidden readonly; +Name: "{app}\doc"; +Name: "{app}\share"; Attribs: hidden ; for wildcards to apply to subfolders, set flag recursesubdirs ; initially copied only the there subfolders recursively ; but to assign files to different components I need a finer grained description [Files] ; hugin executables -Source: "FILES\bin\align_image_stack.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\autooptimiser.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\basename.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\cp.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\echo.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\exiftool.exe"; DestDir: "{app}\bin"; Components: core enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\fulla.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\hugin.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\hugin_hdrmerge.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\hugin_stitch_project.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\make.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\nona.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\nona_gui.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\rm.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\sh.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\uname.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\vig_optimize.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ignoreversion +Source: "FILES\bin\align_image_stack.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\autooptimiser.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\basename.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\cp.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\echo.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\exiftool.exe"; DestDir: "{app}\bin"; Components: core enblend; Flags: overwritereadonly +Source: "FILES\bin\fulla.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\hugin.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\hugin_hdrmerge.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\hugin_stitch_project.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\make.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\nona.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\nona_gui.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\rm.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\sh.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\uname.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly +Source: "FILES\bin\vig_optimize.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly ; autopano-sift-c executables -Source: "FILES\bin\autopano.exe"; DestDir: "{app}\bin"; Components: autopano; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\autopano-c-complete.vbs"; DestDir: "{app}\bin"; Components: autopano; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\generatekeys.exe"; DestDir: "{app}\bin"; Components: autopano; Flags: overwritereadonly ignoreversion +Source: "FILES\bin\autopano.exe"; DestDir: "{app}\bin"; Components: ap_vbs ap_p; Flags: overwritereadonly +Source: "FILES\bin\generatekeys.exe"; DestDir: "{app}\bin"; Components: ap_vbs ap_p; Flags: overwritereadonly +Source: "FILES\bin\APSC.exe"; DestDir: "{app}\bin"; Components: ap_c; Flags: overwritereadonly +Source: "FILES\bin\autopano-c-complete.exe"; DestDir: "{app}\bin"; Components: ap_p; Flags: overwritereadonly +Source: "FILES\bin\perl58.dll"; DestDir: "{app}\bin"; Components: ap_p; Flags: overwritereadonly +Source: "FILES\bin\autopano-c-complete.vbs"; DestDir: "{app}\bin"; Components: ap_vbs; Flags: overwritereadonly + ; enblend/enfuse executables -Source: "FILES\bin\collect_data_enblend.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\collect_data_enfuse.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enblend.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enblend_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enblend_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enfuse.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enfuse_align_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enfuse_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\enfuse_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\exiftool_enblend_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\exiftool_enfuse_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\unique_filename.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ignoreversion +Source: "FILES\bin\collect_data_enblend.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\collect_data_enfuse.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enblend.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enblend_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enblend_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enfuse.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enfuse_align_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enfuse_auto_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enfuse_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\enfuse_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\exiftool_enblend_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\exiftool_enfuse_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly +Source: "FILES\bin\unique_filename.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly ; panotools executables -Source: "FILES\bin\PTblender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTcrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTinfo.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTmasker.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTmender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTOptimizer.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTroller.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTtiff2psd.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTtiffdump.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -Source: "FILES\bin\PTuncrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly ignoreversion -; install counter -Source: "url.txt"; DestDir: "{app}"; DestName: "test.url"; Flags: ignoreversion; Attribs: hidden +Source: "FILES\bin\PTblender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTcrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTinfo.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTmasker.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTmender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTOptimizer.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTroller.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTtiff2psd.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTtiffdump.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +Source: "FILES\bin\PTuncrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly +; install redirect URL to welcome page +Source: "url.txt"; DestDir: "{app}"; DestName: "test.url"; Flags: deleteafterinstall; Attribs: hidden ; documentation ; check why fulla.html and nona.txt are in doc and not in doc/hugin -Source: "FILES\doc\enblend\*"; DestDir: "{app}\doc\enblend"; Components: enblend; Flags: overwritereadonly recursesubdirs ignoreversion -Source: "FILES\doc\hugin\*"; DestDir: "{app}\doc\hugin"; Components: core; Flags: overwritereadonly recursesubdirs ignoreversion -Source: "FILES\doc\panotools\*"; DestDir: "{app}\doc\panotools"; Components: panotools; Flags: overwritereadonly recursesubdirs ignoreversion -Source: "FILES\doc\autopano-sift-C\*"; DestDir: "{app}\doc\autopano-sift-C"; Components: autopano; Flags: overwritereadonly recursesubdirs ignoreversion +Source: "FILES\doc\enblend\*"; DestDir: "{app}\doc\enblend"; Components: enblend; Flags: overwritereadonly recursesubdirs +Source: "FILES\doc\hugin\*"; DestDir: "{app}\doc\hugin"; Components: core; Flags: overwritereadonly recursesubdirs +Source: "FILES\doc\panotools\*"; DestDir: "{app}\doc\panotools"; Components: panotools; Flags: overwritereadonly recursesubdirs +;no docs for ap for now +;Source: "FILES\doc\autopano-sift-C\*"; DestDir: "{app}\doc\autopano-sift-C"; Components: ap_vbs ap_p ap_c; Flags: overwritereadonly recursesubdirs ; hugin's UI and languages -Source: "FILES\share\hugin\*"; DestDir: "{app}\share\hugin"; Components: core; Attribs: hidden; Flags: overwritereadonly recursesubdirs ignoreversion +Source: "FILES\share\hugin\*"; DestDir: "{app}\share\hugin"; Components: core; Attribs: hidden; Flags: overwritereadonly recursesubdirs ; hugin's translations -Source: "FILES\share\locale\*"; DestDir: "{app}\share"; Components: translations; Attribs: hidden; Flags: overwritereadonly recursesubdirs ignoreversion +Source: "FILES\share\locale\*"; DestDir: "{app}\share"; Components: translations; Attribs: hidden; Flags: overwritereadonly recursesubdirs ; release notes for this installer -Source: "Release_Notes.txt"; DestDir: "{app}\doc"; DestName: "Release Notes.txt"; Components: core; Flags: isreadme overwritereadonly ignoreversion +Source: "Release_Notes.txt"; DestDir: "{app}\doc"; DestName: "Release Notes.txt"; Components: core; Flags: isreadme overwritereadonly [InstallDelete] ; processed as first step of installation @@ -154,9 +167,21 @@ Root: HKCR; Subkey: "HuginProject\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\hugin.exe"" ""%1""" ; check if it is worth it to register other App Paths Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Hugin.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\hugin.exe"; Flags: uninsdeletekey -; delete registry entry completely on uninstall +; delete registry entry completely on uninstall - put settings *after* this, else they will be removed Root: HKCU; Subkey: "Software\hugin"; Flags: deletekey; Tasks: "delete_settings" ; could add here default preference, one registry key at a time. +; choice of autopano. 0=Kolor, 1=SIFT-C +Root: HKCU; Subkey: "Software\hugin\AutoPano"; ValueType: dword; ValueName: "Type"; ValueData: 1; Components: ap_vbs ap_p ap_c; Tasks: "default_settings" +; which SIFT-C? 0=default, 1=custom +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: dword; ValueName: "AutopanoExeCustom"; ValueData: 1; Components: ap_vbs ap_p ap_c; Tasks: "default_settings" +; executable to point to +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-c-complete.vbs"; Components: ap_vbs; Tasks: "default_settings" +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\APSC.exe"; Components: ap_c; Tasks: "default_settings" +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-c-complete.exe"; Components: ap_p; Tasks: "default_settings" +; arguments +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--noransac --points 40 --output %o %i"; Components: ap_vbs; Tasks: "default_settings" +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--ransac off --maxdim 1200 --maxmatches %p %o %i"; Components: ap_c; Tasks: "default_settings" +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--noransac --points 40 --output %o %i"; Components: ap_p; Tasks: "default_settings" ; by itself a task does nothing, it needs ot be linked to other installation entries @@ -164,9 +189,10 @@ Name: "modifypath"; Description: "Add application directory to your system path"; GroupDescription: "System:"; Name: "delete_settings"; Description: "Clean Slate? (Deletes previous settings)"; GroupDescription: "System:"; Flags: unchecked; +Name: "default_settings"; Description: "Set Default Settings? (partially implemented)"; GroupDescription: "System:"; Name: "quicklaunch"; Description: "Create Quick Launch Icon"; GroupDescription: "Additional icons:"; Flags: unchecked Name: "desktop"; Description: "Create desktop icons"; GroupDescription: "Additional icons:"; -Name: "desktop\user"; Description: "only fur the current user"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked +Name: "desktop\user"; Description: "only for the current user"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked Name: "desktop\user\hugin"; Description: "Hugin"; GroupDescription: "Additional icons:"; Flags: unchecked Name: "desktop\user\enblend"; Description: "Enblend Droplets"; GroupDescription: "Additional icons:"; Flags: unchecked Name: "desktop\user\enfuse"; Description: "Enfuse Droplets"; GroupDescription: "Additional icons:"; Flags: unchecked @@ -195,6 +221,7 @@ Name: "{userdesktop}\Enfuse"; Filename: "{app}\bin\enfuse_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse Name: "{userdesktop}\Enfuse360"; Filename: "{app}\bin\enfuse_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse Name: "{userdesktop}\EnfuseAlign"; Filename: "{app}\bin\enfuse_align_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse +Name: "{userdesktop}\EnfuseAuto"; Filename: "{app}\bin\enfuse_auto_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse ; Enblend droplets for current user Name: "{userdesktop}\Enblend"; Filename: "{app}\bin\enblend_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enblend Name: "{userdesktop}\Enblend360"; Filename: "{app}\bin\enblend_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enblend @@ -202,6 +229,7 @@ Name: "{commondesktop}\Enfuse"; Filename: "{app}\bin\enfuse_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse Name: "{commondesktop}\Enfuse360"; Filename: "{app}\bin\enfuse_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse Name: "{commondesktop}\EnfuseAlign"; Filename: "{app}\bin\enfuse_align_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse +Name: "{commondesktop}\EnfuseAuto"; Filename: "{app}\bin\enfuse_auto_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse ; Enblend droplets for all users Name: "{commondesktop}\Enblend"; Filename: "{app}\bin\enblend_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enblend Name: "{commondesktop}\Enblend360"; Filename: "{app}\bin\enblend_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enblend Modified: hugin/trunk/platforms/windows/installer/installer_license.txt =================================================================== --- hugin/trunk/platforms/windows/installer/installer_license.txt 2008-02-14 15:46:23 UTC (rev 2838) +++ hugin/trunk/platforms/windows/installer/installer_license.txt 2008-02-14 16:06:27 UTC (rev 2839) @@ -1,29 +1,43 @@ Copyright (C) 2006-2008 Pablo d'Angelo. Additional Authors see AUTHORS.txt files in the documentation. -Built and packaged for binary redistribution 2008-Feb-01 by Yuval Levy. +Built and packaged for binary redistribution @HUGIN_BUILDDATE@ by @HUGIN_BUILDER@. -DISCLAIMER +IMPORTANT -The programs in this installer are experimental and unstable. They may not -work as expected. Use them at your own risk. -This installer is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +Verify the installer's MD5 integrity before running it. Instructions at +<http://panospace.wordpress.com/downloads/#verify> +UPGRADES + +If you installed a previous hugin version using an installer not listed at +<http://panospace.wordpress.com/downloads/#rev>, +please uninstall completely before running this installer. +Upgrades from/to unlisted installers are unsupported. + + SHELF-LIFE -The code evolves rapidly. If the above date is more than a month away, +The code evolves rapidly. If this installer is more than a week old, chances are that the executables in this archive are obsolete. Check out frequently for newer, better versions on <http://panospace.wordpress.com/downloads/> -If these files still work for you, keep using them, but before reporting +If these files still work for you keep using them, but before reporting bugs or asking for support, please download the lastest version and see if it solves the problems you'd like to report. +DISCLAIMER + +The programs in this installer are experimental and unstable. They may not +work as expected. Use them at your own risk. +This installer is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + LICENSE You are free to use, copy, distribute, modify this installer or parts This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2008-02-20 17:47:33
|
Revision: 2903 http://hugin.svn.sourceforge.net/hugin/?rev=2903&view=rev Author: yuv Date: 2008-02-20 09:47:32 -0800 (Wed, 20 Feb 2008) Log Message: ----------- proper registry setting for match-n-shift and updated release notes Modified Paths: -------------- hugin/trunk/platforms/windows/installer/Release_Notes.txt hugin/trunk/platforms/windows/installer/hugin.iss Modified: hugin/trunk/platforms/windows/installer/Release_Notes.txt =================================================================== --- hugin/trunk/platforms/windows/installer/Release_Notes.txt 2008-02-20 17:37:22 UTC (rev 2902) +++ hugin/trunk/platforms/windows/installer/Release_Notes.txt 2008-02-20 17:47:32 UTC (rev 2903) @@ -22,9 +22,9 @@ RECENT CHANGES/BUGFIXES: -* installer can now clean hugin's registry entries on install - but not on uninstall (to avoid removing user's preferences) -* installer can now set some default settings (experimental) +* installer should now put the language files in the proper place + make sure you select the translations if you do a custom install +* improved match-n-shift no longer dependent of ImageMagick Modified: hugin/trunk/platforms/windows/installer/hugin.iss =================================================================== --- hugin/trunk/platforms/windows/installer/hugin.iss 2008-02-20 17:37:22 UTC (rev 2902) +++ hugin/trunk/platforms/windows/installer/hugin.iss 2008-02-20 17:47:32 UTC (rev 2903) @@ -183,7 +183,7 @@ Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-c-complete.exe"; Components: ap_p; Tasks: "default_settings" Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-sift-c.exe"; Components: ap_c; Tasks: "default_settings" ; arguments -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "-f %f -v %v --nomagick -c -p %p -o %o %i"; Components: matchnshift; Tasks: "default_settings" +Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "-f %f -v %v -c -p %p -o %o %i"; Components: matchnshift; Tasks: "default_settings" Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--noransac --points 40 --output %o %i"; Components: ap_p; Tasks: "default_settings" Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--maxmatches %p %o %i"; Components: ap_c; Tasks: "default_settings" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |