diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec5f9bd..5c1e560 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,11 +29,7 @@ variables: $env:NEW_REL = $env:VERS_MAIN+(get-date -format yyMM)+"."+(get-date -format ddHH) $env:NUM_REL = $env:VERS_MAIN+(get-date -format yyMM)+"."+(get-date -format dHH) $env:NUM_DEB = $env:VERS_MAIN+(get-date -format yyMM)+"-beta."+(get-date -format dHH) - $env:NEW_COPYRIGHT = "EgalWare @ 2021-" + (get-date -format yyyy) - #$contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw - #$newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL - #$newContenuto = $newContenuto -replace 'EgalWare © 2021', $env:NEW_COPYRIGHT - #$newContenuto | Set-Content -Path 'VersGen\VersGen.cs' + $env:NEW_COPYRIGHT = "EgalWare @ 2021-" + (get-date -format yyyy) # display versioni generate $resoconto = "Effettuato fix file VersGen | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB; Write-Output $resoconto; @@ -77,8 +73,8 @@ variables: mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/ARCHIVE/$fileVers/$FileName echo "mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/$FileName" } - #mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:INST_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/manifest.xml - #mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:INST_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:INST_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:INST_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/ChangeLog.html # helper creazione files zip x app console .artifactZipper: &artifactZipper diff --git a/Maat.Runner/post-build.ps1 b/Maat.Runner/post-build.ps1 index 7cb0a00..fd983b4 100644 --- a/Maat.Runner/post-build.ps1 +++ b/Maat.Runner/post-build.ps1 @@ -2,13 +2,32 @@ $FileMajMin = "..\MajMin.vers" $MajMin = Get-Content $FileMajMin +$FileVers="..\Resources\VersNum.txt" +$FileManIn="..\Resources\manifest-original.xml" +$FileManOut="..\Resources\manifest.xml" +$FileCLogIn="..\Resources\ChangeLog-original.html" +$FileCLogOut="..\Resources\ChangeLog.html" $currentDate = get-date -format yyMM; -$currentTime = get-date -format dHH; +$currentTime = get-date -format ddHH; $find = "(.|\n)*?"; -$currRelNum = $MajMin + $currentDate +"." + $currentTime +$currRelNum=$MajMin + $currentDate +"." + $currentTime $replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; $csproj = Get-Content $ProjectPath $csprojUpdated = $csproj -replace $find, $replace Set-Content -Path $ProjectPath -Value $csprojUpdated +Set-Content -Path $FileVers -Value $currRelNum +# replace x manifest +$manData = Get-Content $FileManIn +$manData = $manData -replace "1.0.0.0", $currRelNum +$manData = $manData -replace "{{DIRNAME}}", "MagMan" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/0" +$manData = $manData -replace "{{PACKNAME}}", "MagMan.UI" +Set-Content -Path $FileManOut -Value $manData + +# replace x ChangeLog +$clogData = Get-Content $FileCLogIn +$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum +$clogData = $clogData -replace "{{ANNO}}", $currentYear +Set-Content -Path $FileCLogOut -Value $clogData diff --git a/Resources/ChangeLog-original.html b/Resources/ChangeLog-original.html new file mode 100644 index 0000000..ba639ad --- /dev/null +++ b/Resources/ChangeLog-original.html @@ -0,0 +1,27 @@ + + Maat.Installer - Manager for Application & Applicative Task +

Versione: {{CURRENT-REL}}

+
Note di rilascio: + +
+
+ +
+
+ © EgalWare 2021-{{ANNO}} +
+
+ \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html new file mode 100644 index 0000000..aa07019 --- /dev/null +++ b/Resources/ChangeLog.html @@ -0,0 +1,27 @@ + + MagMan - Wood Warehouse Management System +

Versione: 1.0.2404.0412

+
Note di rilascio: + +
+
+ +
+
+ © Steamware 2006-2021 +
+
+ diff --git a/Resources/LogoEgw.png b/Resources/LogoEgw.png new file mode 100644 index 0000000..8d5a7c1 Binary files /dev/null and b/Resources/LogoEgw.png differ diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt new file mode 100644 index 0000000..6a79875 --- /dev/null +++ b/Resources/VersNum.txt @@ -0,0 +1 @@ +1.0.2404.0412 diff --git a/Resources/logoSteamware.png b/Resources/logoSteamware.png new file mode 100644 index 0000000..0958b50 Binary files /dev/null and b/Resources/logoSteamware.png differ diff --git a/Resources/manifest-original.xml b/Resources/manifest-original.xml new file mode 100644 index 0000000..aae0b12 --- /dev/null +++ b/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.msi + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + diff --git a/Resources/manifest.xml b/Resources/manifest.xml new file mode 100644 index 0000000..facc4bb --- /dev/null +++ b/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 1.0.2404.0412 + http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip + http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html + false +