From 8decf6377585c6c38a1da051b8cee69c9c73a671 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 9 Jan 2012 00:04:07 -0600 Subject: [PATCH 1/2] add midi-*-3d noteskins by jousway to the windows installer for a2 --- sm-ssc.nsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sm-ssc.nsi b/sm-ssc.nsi index 20cef7e3c2..319bb4ad17 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -296,6 +296,7 @@ Section "Main Section" SecMain RMDir /r "$INSTDIR\NoteSkins\dance\midi-note-3d" RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo" RMDir /r "$INSTDIR\NoteSkins\dance\midi-vivid" + RMDir /r "$INSTDIR\NoteSkins\dance\midi-vivid-3d" ; old names RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p1" RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p2" @@ -351,6 +352,7 @@ Section "Main Section" SecMain File /r /x CVS /x .svn "NoteSkins\dance\midi-routine-p2" File /r /x CVS /x .svn "NoteSkins\dance\midi-solo" File /r /x CVS /x .svn "NoteSkins\dance\midi-vivid" + File /r /x CVS /x .svn "NoteSkins\dance\midi-vivid-3d" ; retro and retrobar File /r /x CVS /x .svn "NoteSkins\dance\retro" File /r /x CVS /x .svn "NoteSkins\dance\retrobar" From f1bb6312830d4228d1591b23dd2189dbc5a69edc Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 9 Jan 2012 00:15:04 -0600 Subject: [PATCH 2/2] there, fix that stupid "OMG FATAL ERROR except it's not" in the windows installer --- sm-ssc.nsi | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sm-ssc.nsi b/sm-ssc.nsi index 319bb4ad17..9d28f3c071 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -210,7 +210,7 @@ Section "Main Section" SecMain WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "DisplayVersion" "$(PRODUCT_VER)" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "Comments" "StepMania 5 is a rhythm game simulator." WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "Publisher" "StepMania Team" - WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "URLInfoAbout" "http://code.google.com/p/sm-ssc/" + WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "URLInfoAbout" "http://www.stepmania.com/" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "URLUpdateInfo" "http://code.google.com/p/sm-ssc/" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "UninstallString" '"$INSTDIR\uninstall.exe"' !endif @@ -484,33 +484,33 @@ Section "Main Section" SecMain ; Create Start Menu icons SetShellVarContext current # 'all' doesn't work on Win9x - CreateDirectory '"$SMPROGRAMS\${PRODUCT_ID}\"' + CreateDirectory "$SMPROGRAMS\${PRODUCT_ID}\" ; todo: make desktop shortcut an option !ifdef MAKE_DESKTOP_SHORTCUT CreateShortCut "$DESKTOP\$(TEXT_IO_RUN).lnk" "$INSTDIR\Program\StepMania-SSE2.exe" !endif - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN).lnk"' "$INSTDIR\Program\StepMania-SSE2.exe" - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN_WITHOUT_SSE2).lnk"' "$INSTDIR\Program\StepMania.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN).lnk" "$INSTDIR\Program\StepMania-SSE2.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN_WITHOUT_SSE2).lnk" "$INSTDIR\Program\StepMania.exe" !ifdef MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_PROGRAM_FOLDER).lnk"' "$WINDIR\explorer.exe" "$INSTDIR\" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_PROGRAM_FOLDER).lnk" "$WINDIR\explorer.exe" "$INSTDIR\" !endif !ifdef MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_SETTINGS_FOLDER).lnk"' "$WINDIR\explorer.exe" '"$APPDATA\${PRODUCT_ID}"' + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_SETTINGS_FOLDER).lnk" "$WINDIR\explorer.exe" "$APPDATA\${PRODUCT_ID}" !endif - ;CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_VIEW_STATISTICS).lnk"' "$INSTDIR\Program\tools.exe" "--machine-profile-stats" - ;CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TOOLS).lnk"' "$INSTDIR\Program\tools.exe" - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_MANUAL).lnk"' "$INSTDIR\Manual\index.html" - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_UNINSTALL).lnk"' "$INSTDIR\uninstall.exe" - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_WEB_SITE).lnk"' "${PRODUCT_URL}" - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TEXTURE_FONT_GENERATOR).lnk" '"$INSTDIR\Program\Texture Font Generator.exe"'' + ;CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_VIEW_STATISTICS).lnk" "$INSTDIR\Program\tools.exe" "--machine-profile-stats" + ;CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TOOLS).lnk" "$INSTDIR\Program\tools.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_MANUAL).lnk" "$INSTDIR\Manual\index.html" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_UNINSTALL).lnk" "$INSTDIR\uninstall.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_WEB_SITE).lnk" "${PRODUCT_URL}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TEXTURE_FONT_GENERATOR).lnk" "$INSTDIR\Program\Texture Font Generator.exe" !ifdef MAKE_UPDATES_SHORTCUT - CreateShortCut '"$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_CHECK_FOR_UPDATES).lnk"' "${UPDATES_URL}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_CHECK_FOR_UPDATES).lnk" "${UPDATES_URL}" !endif - CreateShortCut '"$INSTDIR\${PRODUCT_ID}.lnk"' "$INSTDIR\Program\StepMania-SSE2.exe" - CreateShortCut '"$INSTDIR\${PRODUCT_ID} (non-SSE2).lnk"' "$INSTDIR\Program\StepMania.exe" + CreateShortCut "$INSTDIR\${PRODUCT_ID}.lnk" "$INSTDIR\Program\StepMania-SSE2.exe" + CreateShortCut "$INSTDIR\${PRODUCT_ID} (non-SSE2).lnk" "$INSTDIR\Program\StepMania.exe" !endif IfErrors do_error do_no_error