@@ -1,4 +1,5 @@ VAR /GLOBAL APPNAME +VAR /GLOBAL APPBIN Name "$APPNAME" @@ -6,7 +7,7 @@ Name "$APPNAME" OutFile "PlexyDeskop-0.1.1-win32.exe" # define installation directory -InstallDir c:\plexydesk\ +InstallDir "c:\plexydesk\" SetCompressor /SOLID lzma @@ -28,7 +29,7 @@ Section "PlexyDesktop Shortcuts" CreateDirectory "$SMPROGRAMS\$APPNAME" CreateShortCut "$SMPROGRAMS\$APPNAME\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\$APPNAME\$APPNAME.lnk" "$INSTDIR\bin\$APPNAME.exe" "" "$INSTDIR\bin\plexydesk.exe" 0 + CreateShortCut "$SMPROGRAMS\$APPNAME\$APPNAME.lnk" "$INSTDIR\bin\$APPBIN.exe" "" "$INSTDIR\bin\$APPBIN.exe" 0 SectionEnd @@ -48,14 +49,15 @@ section SetOutPath $INSTDIR SetOverwrite on - FILE /r c:\installer\*.* + FILE /r plexydesk\*.* # create the uninstaller - writeUninstaller "$INSTDIR\uninstall.exe" + writeUninstaller "c:\$APPBIN\uninstall.exe" sectionEnd Function .onInit StrCpy $APPNAME "PlexyDeskop" +StrCpy $APPBIN "plexydesk" FunctionEnd \ No newline at end of file installer.nsi @@ -1,32 +1,31 @@ -cmake -DCMAKE_INSTALL_PREFIX:STRING="c:\plexydesk\" -G "Visual Studio 9 2008" +cmake -DCMAKE_INSTALL_PREFIX:STRING="plexydesk" msbuild PlexyDesktop.sln /t:Build /p:Configuration=Release -mkdir c:\plexydesk -mkdir c:\plexydesk -mkdir c:\plexydesk\bin -mkdir c:\plexydesk\bin\plugins -mkdir c:\plexydesk\bin\plugins\imageformats +mkdir plexydesk +mkdir plexydesk\bin +mkdir plexydesk\bin\plugins +mkdir plexydesk\bin\plugins\imageformats vcbuild INSTALL.vcproj "Release|Win32" -del /F/S/Q c:\plexydesk\include\qimageblitz\*.* -rmdir /S/Q c:\plexydesk\include\qimageblitz -rmdir /S/Q c:\plexydesk\include -del /F/S/Q c:\plexydesk\*.lib +del /F/S/Q plexydesk\include\qimageblitz\*.* +rmdir /S/Q plexydesk\include\qimageblitz +rmdir /S/Q plexydesk\include +del /F/S/Q plexydesk\*.lib -xcopy %QTDIR%\bin\QtSvg4.dll c:\plexydesk\bin -xcopy %QTDIR%\bin\QtOpenGL4.dll c:\plexydesk\bin -xcopy %QTDIR%\bin\QtNetwork4.dll c:\plexydesk\bin -xcopy %QTDIR%\bin\QtGui4.dll c:\plexydesk\bin -xcopy %QTDIR%\bin\QtCore4.dll c:\plexydesk\bin +xcopy %QTDIR%\bin\QtSvg4.dll plexydesk\bin +xcopy %QTDIR%\bin\QtOpenGL4.dll plexydesk\bin +xcopy %QTDIR%\bin\QtNetwork4.dll plexydesk\bin +xcopy %QTDIR%\bin\QtGui4.dll plexydesk\bin +xcopy %QTDIR%\bin\QtCore4.dll plexydesk\bin -xcopy %QTDIR%\plugins\imageformats\qtiff4.dll c:\plexydesk\bin\plugins\imageformats -xcopy %QTDIR%\plugins\imageformats\qsvg4.dll c:\plexydesk\bin\plugins\imageformats -xcopy %QTDIR%\plugins\imageformats\qmng4.dll c:\plexydesk\bin\plugins\imageformats -xcopy %QTDIR%\plugins\imageformats\qjpeg4.dll c:\plexydesk\bin\plugins\imageformats -xcopy %QTDIR%\plugins\imageformats\qico4.dll c:\plexydesk\bin\plugins\imageformats -xcopy %QTDIR%\plugins\imageformats\qgif4.dll c:\plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qtiff4.dll plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qsvg4.dll plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qmng4.dll plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qjpeg4.dll plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qico4.dll plexydesk\bin\plugins\imageformats +xcopy %QTDIR%\plugins\imageformats\qgif4.dll plexydesk\bin\plugins\imageformats -"C:\Program Files\NSIS\makensis" installer.nsi +"makensis" installer.nsi -rmdir /S/Q c:\plexydesk\ \ No newline at end of file +rmdir /S/Q plexydesk \ No newline at end of file make_win32_installer.bat df96514988d0c7f19139beecf430b0fa5ad5ee86 dariusz.mikulski@gmail.com dariusz.mikulski@gmail.com@e1f824a7-5b42-0410-8aa0-0b4c0c30c80c http://github.com/siraj/plexydesk/commit/3f0fdd2d15a79d6987582f44d1174fbb6ac59b82 3f0fdd2d15a79d6987582f44d1174fbb6ac59b82 2008-08-27T11:04:27-07:00 2008-08-27T11:04:27-07:00 fix windows installer ab4017062c6089b6434ade91686fe983962985e2 dariusz.mikulski@gmail.com dariusz.mikulski@gmail.com@e1f824a7-5b42-0410-8aa0-0b4c0c30c80c