Prepare release script

Author: jginternational

kratos.gid/kratos.tcl

@@ -167,7 +167,7 @@ proc Kratos::InitGlobalVariables {dir} {
     # Is using files modules
     set kratos_private(UseFiles) 0
     # Variables from the problemtype definition (kratos.xml)
-    array set kratos_private [ReadProblemtypeXml [file join $kratos_private(Path) kratos.xml] Infoproblemtype {Name Version MinimumGiDVersion MaximumGiDVersion}]
+    array set kratos_private [ReadProblemtypeXml [file join $kratos_private(Path) kratos.xml] Infoproblemtype {Name Version MinimumGiDVersion MaximumGiDVersion Production}]
 
     variable namespaces
     set namespaces [list ]

kratos.gid/kratos.xml

@@ -4,6 +4,7 @@
   <Program>
     <Name>Kratos</Name>
     <Version>10.3.0</Version>
+    <Production>0</Production>
     <ExecutableVersion></ExecutableVersion>
     <MinimumGiDVersion>16.1.10d</MinimumGiDVersion>
     <MaximumGiDVersion>17.99.99d</MaximumGiDVersion>

kratos.gid/scripts/Applications.tcl

@@ -209,6 +209,14 @@ proc apps::isPublic {appId} {
     return [$app isPublic]
 }
 
+proc apps::isProductionAvailable {appId} {
+    set app [getAppById $appId]
+    if {$app eq ""} {return 0}
+    if {$::Kratos::kratos_private(Production) eq "0"} {return 1}
+    # W "Checking if app $appId is production ready = [$app isProductionReady]"
+    return [$app isProductionReady]
+}
+
 proc apps::CheckElemState {elem inputid {arg ""} } {
     variable activeApp
 
@@ -227,7 +235,7 @@ oo::class create App {
     variable writeCustomEvent
     variable writeValidateEvent
     variable prefix
-    variable release
+    variable production_ready
     variable is_tool
 
     variable properties
@@ -244,6 +252,7 @@ oo::class create App {
         variable public
         variable is_tool
         variable properties
+        variable production_ready
 
         set name $n
         set publicname $n
@@ -263,6 +272,7 @@ oo::class create App {
         set prefix ""
         set public 0
         set is_tool 0
+        set production_ready 0
 
         set properties [dict create ]
         apps::LoadAppProperties [self]
@@ -302,6 +312,8 @@ oo::class create App {
 
     method setPublic {v} {variable public; set public $v}
     method isPublic { } {variable public; return $public}
+    method setProductionReady {v} {variable production_ready; set production_ready $v}
+    method isProductionReady { } {variable production_ready; return $production_ready}
 
     method setIsTool {v} {variable is_tool; set is_tool $v}
     method isTool { } {variable is_tool; return $is_tool}

kratos.gid/scripts/Controllers/ApplicationMarketWindow.tcl

@@ -43,7 +43,8 @@ proc spdAux::CreateInitialApplicationsWindow {} {
     set col 0
     set row 0
     foreach appname $appspn appid $appsid {
-        if {[apps::isPublic $appid]} {
+        if {[apps::isPublic $appid] && [apps::isProductionAvailable $appid] } {
+            # W "Application $appid is public and production available"
             set img [::apps::getImgFrom $appid]
             ttk::button $w.applications.img$appid -image $img -command [list apps::setActiveApp $appid]
             ttk::label $w.applications.text$appid -text $appname

kratos.gid/scripts/spdAuxiliar.tcl

@@ -127,6 +127,16 @@ proc spdAux::processAppIncludes { root } {
         if {[$elem hasAttribute "public"]} {set public [$elem getAttribute "public"]}
         set app [apps::NewApp $appid $pn $prefix]
         $app setPublic $public
+
+        # set the app as production ready if the attribute is present
+        if {[$elem hasAttribute "production"] && [$elem getAttribute "production"] eq "1"} {
+            # W "Setting app $appid as production ready = [$elem getAttribute "production"]"
+            $app setProductionReady 1
+        } else {
+            # W "Setting app $appid as production ready = 0"
+            $app setProductionReady 0
+        }
+        
         if {[$elem hasAttribute "is_tool"] } {$app setIsTool [$elem getAttribute "is_tool"]}
 
         if {$active} {

tools/create-release.bat

@@ -6,13 +6,22 @@ set VERSION=10.3.0
 @REM git branch %BRANCH%
 @REM git checkout %BRANCH%
 
+@REM check if docker is on
+docker --version > NUL 2>&1
+if %errorlevel% neq 0 ( 
+    echo "Docker is not installed or not running. Please install Docker and try again."
+    exit /b 1
+)
 
-git tag -f Release-%version%
-git push --tags --force
 
 @REM run python prepare-release-files.py
 python prepare-release-files.py
 
+git commit -am "Release %VERSION% preparation"
+
+git tag -f Release-%version%
+git push --tags --force
+
 cd ..
 mkdir dist
 set FOLDER=dist\kratos-%VERSION%

tools/prepare-release-files.py

@@ -11,6 +11,17 @@ def get_version_number(file_name):
     return version
 
 if __name__ == "__main__":
+
+    # Open kratos.xml and set Production to 1
+    file_name = "../kratos.gid/kratos.xml"
+    tree = ET.parse(file_name)
+    root = tree.getroot()
+    production = root.find('Production')
+    if production is not None:
+        production.text = '1'
+    else:
+        production = ET.SubElement(root, 'Production')
+        production.text = '1'
 
     file_name = "../kratos.gid/kratos.spd"
     version = get_version_number(file_name)