From 8ab90e44e7c518aff890b9981639bd04d34095c8 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Thu, 16 Nov 2017 19:26:43 +0000 Subject: Removed the duplicate icons and bitmaps Renaming the script for builds, planning to also use that for other than release build types Renamed one of the WiX language files --- public_build.cmd | 30 +++++++++++++++++++++ public_release.cmd | 14 ---------- setup/Cultures/WDS-en-US.wxl | 4 +++ setup/Cultures/WDS-en-us.wxl | 4 --- windirstat/res/0405.Czech/windirstat.rc | Bin 59452 -> 59476 bytes windirstat/res/0407.German/windirstat.rc | Bin 61490 -> 61514 bytes windirstat/res/040a.Spanish/windirstat.rc | Bin 63612 -> 63636 bytes windirstat/res/040b.Finnish/windirstat.rc | Bin 61156 -> 61180 bytes windirstat/res/040c.French/windirstat.rc | Bin 62728 -> 62752 bytes windirstat/res/040e.Hungarian/windirstat.rc | Bin 60738 -> 60762 bytes windirstat/res/0410.Italian/windirstat.rc | Bin 61814 -> 61838 bytes windirstat/res/0413.Dutch/windirstat.rc | Bin 62346 -> 62370 bytes windirstat/res/0415.Polish/windirstat.rc | Bin 62786 -> 62810 bytes .../res/0416.Portuguese_Brazil/windirstat.rc | Bin 60656 -> 60680 bytes windirstat/res/0419.Russian/windirstat.rc | Bin 63754 -> 63778 bytes windirstat/res/0425.Estonian/windirstat.rc | Bin 59928 -> 59952 bytes 16 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 public_build.cmd delete mode 100644 public_release.cmd create mode 100644 setup/Cultures/WDS-en-US.wxl delete mode 100644 setup/Cultures/WDS-en-us.wxl diff --git a/public_build.cmd b/public_build.cmd new file mode 100644 index 0000000..deffe10 --- /dev/null +++ b/public_build.cmd @@ -0,0 +1,30 @@ +@echo off +setlocal ENABLEEXTENSIONS & pushd . +set TGTNAME=wds +set PRJNAME=%TGTNAME%_release +set SIGURL=https://windirstat.net +set SIGDESC=WinDirStat +call "%~dp0common\hgid.cmd" +premake4.exe --release vs2005 +call "setvcvars.cmd" 2005 +:: premake4.exe --release --xp vs2017 +:: call "setvcvars.cmd" 2017 +echo %VCVER_FRIENDLY% +vcbuild.exe /time /rebuild /showenv /M1 /nologo "/htmllog:$(SolutionDir)buildlog.html" "%~dp0%PRJNAME%.vs8.sln" "$ALL" +del /f %PRJNAME%\*.idb +rd /s /q "%~dp0%PRJNAME%_intermediate" +set SEVENZIP=%ProgramFiles%\7-Zip\7z.exe +if not exist "%SEVENZIP%" set SEVENZIP=%ProgramFiles(x86)%\7-Zip\7z.exe +for /f %%i in ('hg id -i') do @set RELEASE=%%i +for /f %%i in ('hg id -n') do @set RELEASE=%%i-%RELEASE% +set RELARCHIVE=%~dp0%TGTNAME%-%RELEASE%.7z +if exist "%SEVENZIP%" @( + pushd "%~dp0%PRJNAME%" + "%SEVENZIP%" a -y -t7z "%RELARCHIVE%" "*.exe" "*.pdb" "*.wdslng" + gpg -ba %RELARCHIVE% + popd +) +:: msbuild.exe "%~dp0\setup\wds_setup.wixproj" +:: Sign the MSIs +:: Create NSIS wrapper +popd & endlocal & goto :EOF diff --git a/public_release.cmd b/public_release.cmd deleted file mode 100644 index 834b4e9..0000000 --- a/public_release.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -setlocal ENABLEEXTENSIONS & pushd . -call "%~dp0common\hgid.cmd" -"%~dp0common\premake4.exe" --release --resources vs2005 -call %~dp0common\setvcvars.cmd 2005 -echo %VCVER_FRIENDLY% -::popd & endlocal & goto :EOF -vcbuild.exe /time /rebuild /showenv /M1 /nologo ^ - "/htmllog:$(SolutionDir)wds_release\buildlog.html" "%~dp0\wds_release.vs8.sln" "$ALL" -:: msbuild.exe "%~dp0\setup\wds_setup.wixproj" -:: Sign the MSIs -:: Create NSIS wrapper -:: Create ZIP file? -popd & endlocal & goto :EOF diff --git a/setup/Cultures/WDS-en-US.wxl b/setup/Cultures/WDS-en-US.wxl new file mode 100644 index 0000000..3da0343 --- /dev/null +++ b/setup/Cultures/WDS-en-US.wxl @@ -0,0 +1,4 @@ + + + Your localized string + diff --git a/setup/Cultures/WDS-en-us.wxl b/setup/Cultures/WDS-en-us.wxl deleted file mode 100644 index 3da0343..0000000 --- a/setup/Cultures/WDS-en-us.wxl +++ /dev/null @@ -1,4 +0,0 @@ - - - Your localized string - diff --git a/windirstat/res/0405.Czech/windirstat.rc b/windirstat/res/0405.Czech/windirstat.rc index b86cae0..024c9d1 100644 Binary files a/windirstat/res/0405.Czech/windirstat.rc and b/windirstat/res/0405.Czech/windirstat.rc differ diff --git a/windirstat/res/0407.German/windirstat.rc b/windirstat/res/0407.German/windirstat.rc index e85ad51..00f3173 100644 Binary files a/windirstat/res/0407.German/windirstat.rc and b/windirstat/res/0407.German/windirstat.rc differ diff --git a/windirstat/res/040a.Spanish/windirstat.rc b/windirstat/res/040a.Spanish/windirstat.rc index 7839454..05ce426 100644 Binary files a/windirstat/res/040a.Spanish/windirstat.rc and b/windirstat/res/040a.Spanish/windirstat.rc differ diff --git a/windirstat/res/040b.Finnish/windirstat.rc b/windirstat/res/040b.Finnish/windirstat.rc index c6711c2..252af25 100644 Binary files a/windirstat/res/040b.Finnish/windirstat.rc and b/windirstat/res/040b.Finnish/windirstat.rc differ diff --git a/windirstat/res/040c.French/windirstat.rc b/windirstat/res/040c.French/windirstat.rc index 3115333..9fb323f 100644 Binary files a/windirstat/res/040c.French/windirstat.rc and b/windirstat/res/040c.French/windirstat.rc differ diff --git a/windirstat/res/040e.Hungarian/windirstat.rc b/windirstat/res/040e.Hungarian/windirstat.rc index 3123e66..d562520 100755 Binary files a/windirstat/res/040e.Hungarian/windirstat.rc and b/windirstat/res/040e.Hungarian/windirstat.rc differ diff --git a/windirstat/res/0410.Italian/windirstat.rc b/windirstat/res/0410.Italian/windirstat.rc index e972659..85a4f64 100644 Binary files a/windirstat/res/0410.Italian/windirstat.rc and b/windirstat/res/0410.Italian/windirstat.rc differ diff --git a/windirstat/res/0413.Dutch/windirstat.rc b/windirstat/res/0413.Dutch/windirstat.rc index 0328ded..9f302a7 100644 Binary files a/windirstat/res/0413.Dutch/windirstat.rc and b/windirstat/res/0413.Dutch/windirstat.rc differ diff --git a/windirstat/res/0415.Polish/windirstat.rc b/windirstat/res/0415.Polish/windirstat.rc index 5db4210..380611a 100755 Binary files a/windirstat/res/0415.Polish/windirstat.rc and b/windirstat/res/0415.Polish/windirstat.rc differ diff --git a/windirstat/res/0416.Portuguese_Brazil/windirstat.rc b/windirstat/res/0416.Portuguese_Brazil/windirstat.rc index 6c3d86c..9bc69c0 100644 Binary files a/windirstat/res/0416.Portuguese_Brazil/windirstat.rc and b/windirstat/res/0416.Portuguese_Brazil/windirstat.rc differ diff --git a/windirstat/res/0419.Russian/windirstat.rc b/windirstat/res/0419.Russian/windirstat.rc index dd275c9..f1bbca9 100644 Binary files a/windirstat/res/0419.Russian/windirstat.rc and b/windirstat/res/0419.Russian/windirstat.rc differ diff --git a/windirstat/res/0425.Estonian/windirstat.rc b/windirstat/res/0425.Estonian/windirstat.rc index 94cdb53..1f4b683 100644 Binary files a/windirstat/res/0425.Estonian/windirstat.rc and b/windirstat/res/0425.Estonian/windirstat.rc differ -- cgit v1.2.3