Update sign release (#247)

* Update scripts * Update version
soup-build · Apr 6, 2024 · 8768a93 · 8768a93
1 parent fe82e1b
commit 8768a93
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 27 deletions.
diff --git a/Docs/Create-Release.md b/Docs/Create-Release.md
@@ -8,12 +8,12 @@ Create a PR with this change.
 ## Build Windows Release
 ```
 ./Scripts/Windows/build.cmd Release
-./Scripts/Windows/soup.cmd version
+./Scripts/Windows/soup-release.cmd version
+./Scripts/Windows/SignRuntime.cmd
 ./Scripts/Windows/release.cmd
+./Scripts/Windows/SignInstaller.cmd
 ```
 
-Manually build ./Source/Installer/Installer.sln
-
 ## Build Linux Release
 ```
 ./Scripts/Linux/build

diff --git a/Scripts/Linux/release b/Scripts/Linux/release
@@ -9,4 +9,4 @@ OUT_DIR=$ROOT_DIR/out
 RUN_DIR=$OUT_DIR/run
 
 # Cleanup previous runs
-tar -a -cf $OUT_DIR/soup-build-0.38.0-linux-x64.tar.gz -C $RUN_DIR .
+tar -a -cf $OUT_DIR/soup-build-0.38.1-linux-x64.tar.gz -C $RUN_DIR .
diff --git a/Scripts/Linux/soup b/Scripts/Linux/soup
@@ -15,7 +15,7 @@ CONFIG_HASH=Oltq7cGwk0Rbgy1I-3mCMDDE5yM
 
 OWNER=mwasplund
 
-SOUP_VERSION="0.38.0"
+SOUP_VERSION="0.38.1"
 COPY_VERSION="1.1.0"
 MKDIR_VERSION="1.1.0"
 SOUP_WREN_VERSION="0.4.1"

diff --git a/Scripts/Linux/soupd b/Scripts/Linux/soupd
@@ -15,7 +15,7 @@ CONFIG_HASH=OZlIVjblazFuKXg-raWUNoGEnG4
 
 OWNER=mwasplund
 
-SOUP_VERSION="0.38.0"
+SOUP_VERSION="0.38.1"
 COPY_VERSION="1.1.0"
 MKDIR_VERSION="1.1.0"
 SOUP_WREN_VERSION="0.4.1"

diff --git a/Scripts/Windows/SignInstaller.cmd b/Scripts/Windows/SignInstaller.cmd
@@ -2,9 +2,10 @@
 SETLOCAL
 SET ScriptsDir=%~dp0
 SET RootDir=%ScriptsDir%..\..
-SET SourceDir=%RootDir%\Source
-SET InstallerDir=%SourceDir%\Installer\SoupInstaller\msi
+SET OutDir=%RootDir%\out
 
-SET CertPath=%1
+SET SIGN_COMMAND=signtool sign /n "Open Source Developer, Matthew Asplund" /t http://time.certum.pl /fd sha1 /v
 
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %InstallerDir%\*.msi
+SET SignFiles=%OutDir%\soup-build-0.38.1-windows-x64.msi
+
+%SIGN_COMMAND% %SignFiles%
diff --git a/Scripts/Windows/SignRuntime.cmd b/Scripts/Windows/SignRuntime.cmd
@@ -5,13 +5,14 @@ SET RootDir=%ScriptsDir%..\..
 SET OutDir=%RootDir%\out
 SET RunDir=%OutDir%\run
 
-SET CertPath=%1
+SET SIGN_COMMAND=signtool sign /n "Open Source Developer, Matthew Asplund" /t http://time.certum.pl /fd sha1 /v
 
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\*.exe
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\*.exe
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Extensions\Soup.Cpp\0.4.3\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Extensions\Soup.CSharp\0.7.4\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\*.exe
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\PackageManager\*.exe
+SET SignFiles=%RunDir%\*.exe
+SET SignFiles=%RunDir%\Soup\*.dll %SignFiles%
+SET SignFiles=%RunDir%\Soup\*.exe %SignFiles%
+SET SignFiles=%RunDir%\Soup\PackageManager\*.dll %SignFiles%
+SET SignFiles=%RunDir%\Soup\PackageManager\*.exe %SignFiles%
+SET SignFiles=%RunDir%\Soup\View\*.dll %SignFiles%
+SET SignFiles=%RunDir%\Soup\View\*.exe %SignFiles%
+
+%SIGN_COMMAND% %SignFiles%
diff --git a/Scripts/Windows/install.cmd b/Scripts/Windows/install.cmd
@@ -4,5 +4,5 @@ SET RootDir=%ScriptsDir%..\..
 SET OutDir=%RootDir%\out
 
 pushd %OutDir%
-start msiexec /package soup-build-0.38.0-windows-x64.msi /passive
+start msiexec /package soup-build-0.38.1-windows-x64.msi /passive
 popd
diff --git a/Scripts/Windows/release.cmd b/Scripts/Windows/release.cmd
@@ -7,7 +7,7 @@ SET RunDir=%OutDir%\run
 SET SourceDir=%RootDir%\Source
 SET InstallerDir=%SourceDir%\Installer\SoupInstaller
 
-SET SOUP_VERSION=0.38.0
+SET SOUP_VERSION=0.38.1
 
 REM - Build MSI Installer
 echo msbuild %InstallerDir% -p:Configuration=Release

diff --git a/Scripts/Windows/soup-release.cmd b/Scripts/Windows/soup-release.cmd
@@ -0,0 +1,39 @@
+@echo off
+SETLOCAL
+SET ScriptsDir=%~dp0
+SET RootDir=%ScriptsDir%..\..
+SET OutDir=%RootDir%\out
+SET RunDir=%OutDir%\run
+SET SourceDir=%RootDir%\Source
+SET GlobalPackagesDir=%UserProfile%\.soup\packages
+SET GlobalOutDir=%UserProfile%\.soup\out
+
+SET ConfigHash=Oltq7cGwk0Rbgy1I-3mCMDDE5yM
+
+SET PKG_OWNER=mwasplund
+
+SET SOUP_VERSION=0.38.1
+SET COPY_VERSION=1.1.0
+SET MKDIR_VERSION=1.1.0
+SET SOUP_WREN_VERSION=0.4.1
+
+REM - Use a copy of the final binary in case we are re-buiding itself
+robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL
+robocopy %OutDir%\Cpp\Local\Soup\%SOUP_VERSION%\%ConfigHash%\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
+
+robocopy %SourceDir%\Tools\Copy\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\copy\%COPY_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
+robocopy %OutDir%\Cpp\Local\copy\%COPY_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\copy\%COPY_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
+
+robocopy %SourceDir%\Tools\Mkdir\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\mkdir\%MKDIR_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
+robocopy %OutDir%\Cpp\Local\mkdir\%MKDIR_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\mkdir\%MKDIR_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
+
+robocopy %GlobalPackagesDir%\Wren\%PKG_OWNER%\Soup.Wren\%SOUP_WREN_VERSION%\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\Soup.Wren\%SOUP_WREN_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
+robocopy %GlobalOutDir%\Wren\%PKG_OWNER%\Soup.Wren\%SOUP_WREN_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\%PKG_OWNER%\Soup.Wren\%SOUP_WREN_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
+
+robocopy %OutDir%\msbuild\bin\Soup.Build.PackageManager\Release\net8.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ *.dll *.exe /MIR /NJH /NJS /NDL > NUL
+
+robocopy %OutDir%\msbuild\bin\SoupView\Release\net8.0\win-x64\publish\ %RunDir%\Soup\View\ *.dll *.exe /MIR /NJH /NJS /NDL > NUL
+
+robocopy %OutDir%\msbuild\bin\Swhere\Release\net8.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
+
+%RunDir%\Soup.cmd %*
diff --git a/Scripts/Windows/soup.cmd b/Scripts/Windows/soup.cmd
@@ -12,7 +12,7 @@ SET ConfigHash=Oltq7cGwk0Rbgy1I-3mCMDDE5yM
 
 SET PKG_OWNER=mwasplund
 
-SET SOUP_VERSION=0.38.0
+SET SOUP_VERSION=0.38.1
 SET COPY_VERSION=1.1.0
 SET MKDIR_VERSION=1.1.0
 SET SOUP_WREN_VERSION=0.4.1

diff --git a/Scripts/Windows/soupd.cmd b/Scripts/Windows/soupd.cmd
@@ -12,7 +12,7 @@ SET ConfigHash=OZlIVjblazFuKXg-raWUNoGEnG4
 
 SET PKG_OWNER=mwasplund
 
-SET SOUP_VERSION=0.38.0
+SET SOUP_VERSION=0.38.1
 SET COPY_VERSION=1.1.0
 SET MKDIR_VERSION=1.1.0
 SET SOUP_WREN_VERSION=0.4.1

diff --git a/Source/Client/CLI/Recipe.sml b/Source/Client/CLI/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Soup'
-Version: '0.38.0'
+Version: '0.38.1'
 Language: 'C++|0'
 
 Type: 'Executable'

diff --git a/Source/Client/CLI/Source/Commands/VersionCommand.h b/Source/Client/CLI/Source/Commands/VersionCommand.h
@@ -31,7 +31,7 @@ namespace Soup::Client
 
 			// TODO var version = Assembly.GetExecutingAssembly().GetName().Version;
 			// Log::Message($"{version.Major}.{version.Minor}.{version.Build}");
-			Log::HighPriority("0.38.0");
+			Log::HighPriority("0.38.1");
 		}
 
 	private:

diff --git a/Source/Installer/SoupInstaller/SoupInstaller.csproj b/Source/Installer/SoupInstaller/SoupInstaller.csproj
@@ -12,9 +12,9 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+    <Nullable>disable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>