Index: scripts/makepkg.bat =================================================================== diff -u -r97393c286f516de910e4ea5a133067c5114b29d5 -r48e3f41a2b7446047a8c228d8f9f40e61f5d5098 --- scripts/makepkg.bat (.../makepkg.bat) (revision 97393c286f516de910e4ea5a133067c5114b29d5) +++ scripts/makepkg.bat (.../makepkg.bat) (revision 48e3f41a2b7446047a8c228d8f9f40e61f5d5098) @@ -69,8 +69,19 @@ cd %MainProjectDir% rem ---------------------------------------------------- +echo Retrieving current version number +set _ver_cmd=type "src\common\version.h" +for /f "tokens=3 delims= " %%a in ('%_ver_cmd% ^|find "define PRODUCT_VERSION "') do set CHVER=%%~a +if "%CHVER%" == "" ( + echo Can't get the svn version. + goto cleanup +) + +echo Preparing the %CHVER% version of Copy Handler + +rem ---------------------------------------------------- echo Preparing the source package -7z a "%OutputDir%\chsrc.zip" -tzip -x!!"scripts\*.bat" . +7z a "%OutputDir%\chsrc-%CHVER%.zip" -tzip -x!!"scripts\*.bat" . if errorlevel 1 ( echo Preparation of the sources failed. goto cleanup @@ -102,7 +113,7 @@ cd %MainProjectDir%\bin\release -7z a "%OutputDir%\ch_symbols.zip" -tzip "*.pdb" +7z a "%OutputDir%\ch_symbols-%CHVER%.zip" -tzip "*.pdb" if errorlevel 1 ( echo Could not create symbols archive. goto cleanup @@ -142,7 +153,7 @@ cd %MainProjectDir%\bin\release -7z a "%OutputDir%\ch_symbols64.zip" -tzip "*64*.pdb" +7z a "%OutputDir%\ch_symbols64-%CHVER%.zip" -tzip "*64*.pdb" if errorlevel 1 ( echo Could not create symbols archive. goto cleanup @@ -183,7 +194,7 @@ cd "%TmpDir%\zip32\" -7z a "%OutputDir%\ch32.zip" -tzip . +7z a "%OutputDir%\ch32-%CHVER%.zip" -tzip . if errorlevel 1 ( echo Could not create win32 zip archive. goto cleanup @@ -207,7 +218,7 @@ cd "%TmpDir%\zip64\" -7z a "%OutputDir%\ch64.zip" -tzip . +7z a "%OutputDir%\ch64-%CHVER%.zip" -tzip . if errorlevel 1 ( echo Could not create win64 zip archive. goto cleanup Index: scripts/setup.iss =================================================================== diff -u -ra64fdab1cc0a6a1331f71eeee303ae3d2f218c35 -r48e3f41a2b7446047a8c228d8f9f40e61f5d5098 --- scripts/setup.iss (.../setup.iss) (revision a64fdab1cc0a6a1331f71eeee303ae3d2f218c35) +++ scripts/setup.iss (.../setup.iss) (revision 48e3f41a2b7446047a8c228d8f9f40e61f5d5098) @@ -12,7 +12,7 @@ #endif #if X86_64 - #define InstallerFilename "chsetup64_" + PRODUCT_VERSION + #define InstallerFilename "chsetup64-" + PRODUCT_VERSION #define ExeFilename "ch64.exe" #define ShellExtFilename "chext64.dll" @@ -23,7 +23,7 @@ #define MSRedistDir "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\amd64" #define DbgHelp "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\Remote Debugger\x64" #else - #define InstallerFilename "chsetup32_" + PRODUCT_VERSION + #define InstallerFilename "chsetup32-" + PRODUCT_VERSION #define ExeFilename "ch.exe" #define ShellExtFilename "chext.dll"