From: <sv...@ww...> - 2008-02-17 13:26:29
|
Author: nsmoooose Date: 2008-02-17 05:26:20 -0800 (Sun, 17 Feb 2008) New Revision: 2217 Modified: trunk/csp/dist/win/demo/ trunk/csp/dist/win/devpack/ trunk/csp/dist/win/layout/ trunk/csp/dist/win/layout/demo.nsi Log: Modified the nullsoft installer package for the layout editor. This change makes it possible to redistribute the layout editor without having the development environment installed. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2217 Property changes on: trunk/csp/dist/win/demo ___________________________________________________________________ Name: svn:ignore + makedemo.log Thumbs.db Property changes on: trunk/csp/dist/win/devpack ___________________________________________________________________ Name: svn:ignore + Thumbs.db Property changes on: trunk/csp/dist/win/layout ___________________________________________________________________ Name: svn:ignore + build makedemo.log Thumbs.db *.exe Modified: trunk/csp/dist/win/layout/demo.nsi =================================================================== --- trunk/csp/dist/win/layout/demo.nsi 2008-02-17 10:20:31 UTC (rev 2216) +++ trunk/csp/dist/win/layout/demo.nsi 2008-02-17 13:26:20 UTC (rev 2217) @@ -1,20 +1,20 @@ ; Combat Simulator Project -; Windows demo installer script. +; Windows layout installer script. ; Requires one externally defined variable: -; VERSION - the demo version (e.g. "0.6"). The demo directory -; is expected to be csp-demo-${VERSION}. +; VERSION - the layout version (e.g. "0.6"). The layout directory +; is expected to be csp-layout-${VERSION}. ; Modern UI !include "MUI.nsh" !define WriteEnvStr_RegKey 'HKCU "Environment"' - Name "CSP Demo ${VERSION}" - OutFile "csp-demo-${VERSION}-installer.exe" + Name "CSP Layout ${VERSION}" + OutFile "csp-layout-${VERSION}-installer.exe" - InstallDir "$PROGRAMFILES\csp-demo-${VERSION}" - InstallDirRegKey HKCU "Software\csp-demo-${VERSION}" "" + InstallDir "$PROGRAMFILES\csp-layout-${VERSION}" + InstallDirRegKey HKCU "Software\csp-layout-${VERSION}" "" Var MUI_TEMP Var STARTMENU_FOLDER @@ -24,7 +24,7 @@ !define MUI_ABORTWARNING !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_TEXT "Run demo" + !define MUI_FINISHPAGE_RUN_TEXT "Run layout editor" !define MUI_FINISHPAGE_RUN_FUNCTION LaunchLink !define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt" @@ -34,7 +34,7 @@ !define MUI_FINISHPAGE_LINK_LOCATION "http://csp.sf.net/wiki/Windows_Demo_0.6" !define MUI_FINISHPAGE_NOREBOOTSUPPORT - !insertmacro MUI_PAGE_LICENSE "csp-demo-${VERSION}\COPYING.txt" + !insertmacro MUI_PAGE_LICENSE "csp-layout-${VERSION}\COPYING.txt" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER !insertmacro MUI_PAGE_INSTFILES @@ -46,19 +46,19 @@ !insertmacro MUI_LANGUAGE "English" VIProductVersion "${VERSION}.0.0" - VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Combat Simulator Project Demo" + VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Combat Simulator Project Layout Editor" VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Visit http://csp.sf.net/wiki/Demo for more information." - VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "CSP Demo Installer" + VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "CSP Layout Installer" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" -Section "Demo" SecDemo +Section "Layout" SecLayout SetOutPath "$INSTDIR" - File /r "csp-demo-${VERSION}\*" + File /r "csp-layout-${VERSION}\*" ;Store installation folder - WriteRegStr HKCU "Software\csp-demo-${VERSION}" "" $INSTDIR + WriteRegStr HKCU "Software\csp-layout-${VERSION}" "" $INSTDIR ;Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -68,8 +68,8 @@ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\readme.lnk" "$INSTDIR\README.txt" SetOutPath "$INSTDIR\bin" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\sim.lnk" "$INSTDIR\bin\sim.exe" "" "" "" "" "" "Run demo" - CreateShortCut "$INSTDIR\sim.lnk" "$INSTDIR\bin\sim.exe" "" "" "" "" "" "Run demo" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\layout.lnk" "$INSTDIR\bin\layout.exe" "" "" "" "" "" "Run layout editor" + CreateShortCut "$INSTDIR\layout.lnk" "$INSTDIR\bin\layout.exe" "" "" "" "" "" "Run layout editor" SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_END @@ -81,7 +81,7 @@ !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\sim.lnk" + Delete "$SMPROGRAMS\$MUI_TEMP\layout.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\readme.lnk" StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: @@ -92,11 +92,11 @@ StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop startMenuDeleteLoopDone: - DeleteRegKey /ifempty HKCU "Software\csp-demo-${VERSION}" + DeleteRegKey /ifempty HKCU "Software\csp-layout-${VERSION}" SectionEnd Function LaunchLink - ExecShell "" "$INSTDIR\sim.lnk" + ExecShell "" "$INSTDIR\layout.lnk" FunctionEnd |