From 96d9e8151bc9073f904319fbf49fc3e838b0ffb3 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Sun, 13 Feb 2011 19:39:49 +0000 Subject: [PATCH] Cleaned up installer files and script --- install/BuildInstaller.exe | Bin 20480 -> 0 bytes install/buildinstaller.ini | 7 ----- install/embreader.nsi | 50 ++++++++-------------------------- install/make-all-packages.bat | 8 ------ install/update.ini | 1 - 5 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 install/BuildInstaller.exe delete mode 100644 install/buildinstaller.ini delete mode 100644 install/make-all-packages.bat delete mode 100644 install/update.ini diff --git a/install/BuildInstaller.exe b/install/BuildInstaller.exe deleted file mode 100644 index 95b4ae868d46f8343a8f8d327f900f3aab64dbb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 XK!8AiK!8AiK!8AiK!Ct6guwp-hR*4r diff --git a/install/buildinstaller.ini b/install/buildinstaller.ini deleted file mode 100644 index 6767837..0000000 --- a/install/buildinstaller.ini +++ /dev/null @@ -1,7 +0,0 @@ -AssemblyInfo Path=..\embroideryReader\Properties\AssemblyInfo.cs -nsis path=C:\Program Files (x86)\NSIS\makensis.exe -nsis arguments=/DVERSION={ver} /Doutfile={outfile} embreader.nsi -7-zip path=C:\Program Files\7-Zip\7z.exe -source zip arguments=a -tzip -r embroideryReader{ver-file}-source.zip source-zip\* -binary zip arguments=a -tzip embroideryReader{ver-file}.zip embroideryReader.exe nc_settings.dll nc_Updater.dll PesFile.dll -publish folder=upload-me \ No newline at end of file diff --git a/install/embreader.nsi b/install/embreader.nsi index 197623a..8737389 100644 --- a/install/embreader.nsi +++ b/install/embreader.nsi @@ -15,7 +15,7 @@ Name "Embroidery Reader" ; The file to write -OutFile "${outfile}" +OutFile "embroideryReadervvv-setup.exe" ; The default installation directory InstallDir "$PROGRAMFILES\Embroidery Reader" @@ -37,7 +37,7 @@ UninstPage instfiles ;-------------------------------- ; The stuff to install -Section "Embroidery Reader ${VERSION} (required)" +Section "Embroidery Reader (required)" SectionIn RO @@ -48,11 +48,10 @@ Section "Embroidery Reader ${VERSION} (required)" SetOutPath $INSTDIR ; Put file there - File "embroideryReader.exe" - File "nc_settings.dll" - File "PesFile.dll" - File "nc_Updater.dll" - File "embroideryThumbs.dll" + File "embroideryReader.exe" + File "IniFile.dll" + File "PesFile.dll" + File "UpdateCheck.dll" ; Write the installation path into the registry WriteRegStr HKLM "SOFTWARE\Embroidery Reader" "Install_Dir" "$INSTDIR" @@ -85,7 +84,6 @@ Section "Associate with .PES files" WriteRegStr HKCR ".pes" "backup_val" $1 "${Index}-NoBackup:" WriteRegStr HKCR ".pes" "" "EmbroideryDesign" - WriteRegStr HKCR ".pes" "PerceivedType" "image" ReadRegStr $0 HKCR "EmbroideryDesign" "" StrCmp $0 "" 0 "${Index}-Skip" WriteRegStr HKCR "EmbroideryDesign" "" "Embroidery Design File" @@ -93,33 +91,6 @@ Section "Associate with .PES files" WriteRegStr HKCR "EmbroideryDesign\DefaultIcon" "" "$INSTDIR\embroideryReader.exe,0" "${Index}-Skip:" WriteRegStr HKCR "EmbroideryDesign\shell\open\command" "" '$INSTDIR\embroideryReader.exe "%1"' - - - - # Tell shell to use this for thumbnails - ;StrCmp $DoThumbs 0 +3 - WriteRegStr HKCR ".pes\ShellEx" "" "" - WriteRegStr HKCR ".pes\ShellEx\{BB2E617C-0920-11d1-9A0B-00C04FC2D6C1}" "" "{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}" - - # Add thumbnail extractor classes - WriteRegStr HKCR "PESIcon.Extractor" "" "Embroidery Design Thumbnail Extractor" - WriteRegStr HKCR "PESIcon.Extractor\CLSID" "" "{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}" - WriteRegStr HKCR "PESIcon.Extractor\CurVer" "" "PESIcon.Extractor.1" - WriteRegStr HKCR "PESIcon.Extractor.1" "" "Embroidery Design Thumbnail Extractor" - WriteRegStr HKCR "PESIcon.Extractor.1\CLSID" "" "{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}" - - # Add CLSID - WriteRegStr HKCR "CLSID\{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}" "" "Embroidery Design Thumbnail Extractor" - WriteRegStr HKCR "CLSID\{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}\InProcServer32" "" "$INSTDIR\embroideryThumbs.dll" - WriteRegStr HKCR "CLSID\{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}\InProcServer32" "ThreadingModel" "Apartment" - WriteRegStr HKCR "CLSID\{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}\ProgId" "" "PESIcon.Extractor.1" - WriteRegStr HKCR "CLSID\{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}\VersionIndependantProgId" "" "PESIcon.Extractor" - - # Add to shell approved extensions list - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" "{7E3EF3E8-39D4-4150-9EFF-58C71A1F4F9E}" "Embroidery Design Thumbnail Extractor" - - # Cause explorer shell to reload settings - #System::Call "shell32::SHChangeNotify(i,i,i,i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_FLUSH}, 0, 0)" System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)' !undef Index @@ -158,15 +129,16 @@ Section "Uninstall" ; Remove files and uninstaller Delete $INSTDIR\embroideryReader.exe Delete $INSTDIR\uninstall.exe - Delete $INSTDIR\nc_settings.dll - Delete $INSTDIR\embroideryreader.ini Delete $INSTDIR\PesFile.dll - Delete $INSTDIR\nc_Updater.dll - Delete $INSTDIR\embroideryThumbs.dll + Delete $INSTDIR\UpdateCheck.dll + Delete $INSTDIR\IniFile.dll ; Remove obsolete files from previous versions, if they exist Delete $INSTDIR\UpdateInstaller.exe RMDir "$INSTDIR\update" + Delete $INSTDIR\nc_settings.dll + Delete $INSTDIR\embroideryreader.ini + Delete $INSTDIR\nc_Updater.dll ; Remove shortcuts, if any Delete "$SMPROGRAMS\Embroidery Reader\*.*" diff --git a/install/make-all-packages.bat b/install/make-all-packages.bat deleted file mode 100644 index 3f91e19..0000000 --- a/install/make-all-packages.bat +++ /dev/null @@ -1,8 +0,0 @@ -svn export http://medium/newrepos/EmbroideryReader/trunk source-zip -echo "Check source-zip folder, make sure there are no unwanted files" -pause -BuildInstaller.exe -rmdir /Q /S source-zip -move embreadsetup*.exe upload-me\ -move embroideryReader*.zip upload-me\ -copy update.ini upload-me\ \ No newline at end of file diff --git a/install/update.ini b/install/update.ini deleted file mode 100644 index 2652440..0000000 --- a/install/update.ini +++ /dev/null @@ -1 +0,0 @@ -version=1.4.0.5