From 092dd4353b02a06576e5dfb635138ce5e0a22999 Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 21:38:14 +0200 Subject: [PATCH 1/7] [PATCH 02/32] Package all the exe files from the installation --- win/Inno_Setup_Wizard/sneedacity.iss.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/Inno_Setup_Wizard/sneedacity.iss.in b/win/Inno_Setup_Wizard/sneedacity.iss.in index 5c9cd23bc0..a12ef4f390 100644 --- a/win/Inno_Setup_Wizard/sneedacity.iss.in +++ b/win/Inno_Setup_Wizard/sneedacity.iss.in @@ -96,7 +96,7 @@ Source: ".\FirstTimeModel.ini"; DestDir: "{app}"; DestName: "FirstTime.ini"; Per Source: "Additional\README.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "Additional\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#AppExe}"; DestDir: "{app}"; Flags: ignoreversion +Source: "Package\*.exe"; DestDir: "{app}"; Flags: ignoreversion ; Manual, which should be got from the manual wiki using ..\scripts\mw2html_sneedacity\wiki2htm.bat @MANUAL@ From 2cb9bf0c3a330db5446dbe56af81f40ff614bfdd Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 21:40:33 +0200 Subject: [PATCH 2/7] [PATCH 06/32] A correction to de.po suggested by Felix Pahl ("joriki") --- locale/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de.po b/locale/de.po index c34651be99..a640d782f9 100644 --- a/locale/de.po +++ b/locale/de.po @@ -4822,7 +4822,7 @@ msgstr "Herzlich Willkommen zu Sneedacity-Version %s" #: src/ProjectManager.cpp #, c-format msgid "%sSave changes to %s?" -msgstr "%sÄnderungen speichern nach %s?" +msgstr "%sÄnderungen an %s speichern?" #: src/ProjectManager.cpp msgid "Save project before closing?" From 4b1bf20641d6cb23d4ea5290d7e809cdbd83913c Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 21:47:57 +0200 Subject: [PATCH 3/7] [PATCH 12/32] Reverse meanings of "Grayscale" and "Inverse Grayscale" --- src/AColor.cpp | 16 ++++++++-------- src/prefs/SpectrogramSettings.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/AColor.cpp b/src/AColor.cpp index 57b90bf722..839674d533 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -714,7 +714,7 @@ void AColor::PreComputeGradient() { gradient_pre[selected][1][i][2] = (unsigned char) (255 * b); } - // colorScheme 2: Grayscale + // colorScheme 3: Inverse Grayscale for (int i = 0; i < gradientSteps; i++) { float r, g, b; float value = float(i) / gradientSteps; @@ -743,12 +743,12 @@ void AColor::PreComputeGradient() { b = 1.0f; break; } - gradient_pre[selected][2][i][0] = (unsigned char)(255 * r); - gradient_pre[selected][2][i][1] = (unsigned char)(255 * g); - gradient_pre[selected][2][i][2] = (unsigned char)(255 * b); + gradient_pre[selected][3][i][0] = (unsigned char)(255 * r); + gradient_pre[selected][3][i][1] = (unsigned char)(255 * g); + gradient_pre[selected][3][i][2] = (unsigned char)(255 * b); } - // colorScheme 3: Inv. Grayscale (=Old grayscale) + // colorScheme 2: Grayscale (=Old grayscale) for (int i = 0; iRead(wxT("/Spectrum/Grayscale"), 0L) != 0); if (isGrayscale && !gPrefs->Read(wxT("/Spectrum/ColorScheme"), &value)) { - value = GetColorSchemeNames().at(csInvGrayscale).Internal(); + value = GetColorSchemeNames().at(csGrayscale).Internal(); Write(value); gPrefs->Flush(); } From 92515672432284f21609a764aaf3327b70a9a36c Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 21:51:49 +0200 Subject: [PATCH 4/7] [PATCH 17/32] Fixes x86 install location on Windows 64 --- win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake b/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake index abb845a4d0..f76b99dfef 100644 --- a/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake +++ b/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake @@ -12,10 +12,10 @@ if( BUILDING_64_BIT ) set( INSTALLER_SUFFIX "x64" ) - set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64") + set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64" ) else() set( INSTALLER_SUFFIX "x86" ) - set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64") + set( INSTALLER_X64_MODE "" ) endif() if( SIGN ) From 7f296c3d51aa1704800d9ac2017811053262039e Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 22:04:20 +0200 Subject: [PATCH 5/7] [PATCH 19/32] Adds an SSE2 version of lrint family --- src/float_cast.h | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/float_cast.h b/src/float_cast.h index 798a363425..9f23faf315 100644 --- a/src/float_cast.h +++ b/src/float_cast.h @@ -106,17 +106,40 @@ return intgr ; } -#elif (defined (WIN32) || defined (_WIN32)) && defined(_M_3X64) +#elif (defined (WIN32) || defined (_WIN32)) && defined(_M_X64) #include #include + #include - __inline long int - lrintf (float flt) + #ifdef _MSC_VER + #pragma function(lrint, lrintf) + #endif + + __inline + long int lrint(double flt) { - return _mm_cvt_ss2si(_mm_set_ss(flt)); + return _mm_cvtsd_si32(_mm_set_sd(flt)); + } + + __inline + long int lrintf (float flt) + { + return _mm_cvtss_si32(_mm_set_ss(flt)); } + __inline + long long int llrint(double flt) + { + return _mm_cvtsd_si64(_mm_set_sd(flt)); + } + + __inline + long long int llrintf(float flt) + { + return _mm_cvtss_si64(_mm_set_ss(flt)); + } + #elif (HAVE_LRINT && HAVE_LRINTF) /* These defines enable functionality introduced with the 1999 ISO C @@ -146,6 +169,6 @@ #include #define lrint(dbl) ((int)rint(dbl)) - #define lrintf(flt) ((int)rint(flt)) + #define lrintf(flt) ((int)rint(flt)) #endif From fa4f00cc160a61f7604877f83638f0db1572547a Mon Sep 17 00:00:00 2001 From: ckath Date: Wed, 14 Jul 2021 22:05:54 +0200 Subject: [PATCH 6/7] [PATCH 21/32] Always run CPack, even on Windows in release mode --- scripts/ci/package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/package.sh b/scripts/ci/package.sh index f85c8e9f11..734b376bbb 100755 --- a/scripts/ci/package.sh +++ b/scripts/ci/package.sh @@ -6,10 +6,10 @@ set -euxo pipefail cd build +cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose + if [[ "${OSTYPE}" == msys* && ${GIT_BRANCH} == release* ]]; then # Windows cmake --build . --target innosetup --config "${SNEEDACITY_BUILD_TYPE}" -else - cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose fi # Remove the temporary directory From ef102ef66a8f042e90531127c6d41153d20802a4 Mon Sep 17 00:00:00 2001 From: ChucksConsulting <86988958+ChucksConsulting@users.noreply.github.com> Date: Tue, 11 Jan 2022 14:50:02 -0300 Subject: [PATCH 7/7] Update package.sh --- scripts/ci/package.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/ci/package.sh b/scripts/ci/package.sh index eab90d1eb9..734b376bbb 100755 --- a/scripts/ci/package.sh +++ b/scripts/ci/package.sh @@ -6,14 +6,11 @@ set -euxo pipefail cd build +cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose + if [[ "${OSTYPE}" == msys* && ${GIT_BRANCH} == release* ]]; then # Windows cmake --build . --target innosetup --config "${SNEEDACITY_BUILD_TYPE}" -else - set +e - cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose || - (set -e ; echo "build failed, trying one more time" ; - cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose) fi # Remove the temporary directory -rm -Rf package/_CPack_Packages \ No newline at end of file +rm -Rf package/_CPack_Packages