added openms license

Arslan-Siraj · Nov 27, 2024 · 57da9e8 · 57da9e8
1 parent 09b4d62
commit 57da9e8
Show file tree

Hide file tree

Showing 4 changed files with 526 additions and 279 deletions.
diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml
@@ -298,76 +298,76 @@ jobs:
       run: |
         mkdir SourceDir
         mv streamlit_exe/* SourceDir
-        cp dummy_license.rtf SourceDir
+        cp assets/openms_license.rtf SourceDir
         cp assets/openms.ico SourceDir
 
-          - name: Generate WiX XML file
-        run: |
-          echo '<?xml version="1.0"?>' > streamlit_exe.wxs
-          echo '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">' >> streamlit_exe.wxs
-          echo '  <Product Id="*" Name="${{ env.APP_NAME }}" Language="1033" Version="1.0.0.0" Manufacturer="OpenMS" UpgradeCode="8d28e8c7-45dc-446c-b889-99a6aea2f1a5">' >> streamlit_exe.wxs
-          echo '    <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine"/>' >> streamlit_exe.wxs
-          echo '    <Media Id="1" Cabinet="streamlit.cab" EmbedCab="yes" />' >> streamlit_exe.wxs
-
-                    # Folder used 
-          echo '    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />' >> streamlit_exe.wxs
-          echo '    <Property Id="INSTALLFOLDER" Secure="yes" />' >> streamlit_exe.wxs
-          echo '    <Directory Id="TARGETDIR" Name="SourceDir">' >> streamlit_exe.wxs
-          echo '      <Directory Id="ProgramFilesFolder">' >> streamlit_exe.wxs
-          echo '        <Directory Id="INSTALLFOLDER" Name="StreamlitApp" />' >> streamlit_exe.wxs
-          echo '      </Directory>' >> streamlit_exe.wxs
-          echo '      <Directory Id="DesktopFolder" />' >> streamlit_exe.wxs
-          echo '    </Directory>' >> streamlit_exe.wxs
-
-                    # Add component 
-          echo '    <Feature Id="MainFeature" Title="Main Application" Level="1">' >> streamlit_exe.wxs
-          echo '      <ComponentGroupRef Id="StreamlitExeFiles" />' >> streamlit_exe.wxs
-          echo '      <ComponentRef Id="DesktopShortcutComponent" />' >> streamlit_exe.wxs
-          echo '      <ComponentRef Id="InstallDirShortcutComponent" />' >> streamlit_exe.wxs
-          echo '    </Feature>' >> streamlit_exe.wxs
-
-                    # Create shortcut for run App on Desktop
-          echo '    <Component Id="DesktopShortcutComponent" Guid="3597b243-9180-4d0b-b105-30d8b0d1a334" Directory="DesktopFolder">' >> streamlit_exe.wxs
-          echo '      <Shortcut Id="DesktopShortcut" Name="${{ env.APP_NAME }}" Description="Launch ${{ env.APP_NAME }}" Target="[INSTALLFOLDER]${{ env.APP_NAME }}.bat" WorkingDirectory="INSTALLFOLDER" Icon="AppIcon"/>' >> streamlit_exe.wxs
-          echo '      <RegistryValue Root="HKCU" Key="Software\OpenMS\${{ env.APP_NAME }}" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />' >> streamlit_exe.wxs
-          echo '    </Component>' >> streamlit_exe.wxs
-          
-                    # Create shortcut for run App in Installer folder
-          echo '    <Component Id="InstallDirShortcutComponent" Guid="c2df9472-3b45-4558-a56d-6034cf7c8b72" Directory="INSTALLFOLDER">' >> streamlit_exe.wxs
-          echo '      <Shortcut Id="InstallDirShortcut" Name="${{ env.APP_NAME }}" Description="Launch ${{ env.APP_NAME }}" Target="[INSTALLFOLDER]${{ env.APP_NAME }}.bat" WorkingDirectory="INSTALLFOLDER" Icon="AppIcon"/>' >> streamlit_exe.wxs
-          echo '      <RegistryValue Root="HKCU" Key="Software\OpenMS\${{ env.APP_NAME }}" Name="InstallFolderShortcut" Type="integer" Value="1" KeyPath="yes" />' >> streamlit_exe.wxs
-          echo '    </Component>' >> streamlit_exe.wxs
-          
-                    # Provide icon here, should exists in SourceDir folder
-          echo '    <Icon Id="AppIcon" SourceFile="SourceDir/openms.ico" />' >> streamlit_exe.wxs
-          
-                    # Create Bat file during installtion
-          echo '    <CustomAction Id="CreateBatFile" Directory="INSTALLFOLDER" Execute="deferred" Return="check"' >> streamlit_exe.wxs
-          echo '                  ExeCommand="cmd.exe /c echo @echo off &gt; [INSTALLFOLDER]${{ env.APP_NAME }}.bat &amp;&amp; echo [INSTALLFOLDER]python-${{ env.PYTHON_VERSION }}\\python.exe -m streamlit run [INSTALLFOLDER]app.py local &gt;&gt; [INSTALLFOLDER]${{ env.APP_NAME }}.bat" />' >> streamlit_exe.wxs
-                    
-                    # Run app directly after installation
-          echo '    <CustomAction Id="RunApp" Directory="INSTALLFOLDER" Execute="deferred" Return="asyncNoWait"' >> streamlit_exe.wxs
-          echo '                  ExeCommand="cmd.exe /c &quot;[INSTALLFOLDER]${{ env.APP_NAME }}.bat&quot;" />' >> streamlit_exe.wxs
-
-                    # Run Bat file during uninstallation
-          echo '    <CustomAction Id="RemoveBatFile" Directory="INSTALLFOLDER" Execute="deferred" Return="ignore"' >> streamlit_exe.wxs 
-          echo '                  ExeCommand="cmd.exe /c del /f /q [INSTALLFOLDER]${{ env.APP_NAME }}.bat&quot;" />' >> streamlit_exe.wxs
-                    
-                    # Add all Custom action
-          echo '    <InstallExecuteSequence>' >> streamlit_exe.wxs
-          echo '      <Custom Action="CreateBatFile" After="InstallFiles">NOT REMOVE</Custom>' >> streamlit_exe.wxs
-          echo '      <Custom Action="RunApp" Before="InstallFinalize">NOT REMOVE</Custom>' >> streamlit_exe.wxs
-          echo '      <Custom Action="RemoveBatFile" Before="RemoveFiles">REMOVE="ALL"</Custom>' >> streamlit_exe.wxs
-          echo '    </InstallExecuteSequence>' >> streamlit_exe.wxs
-          echo '    <UI>' >> streamlit_exe.wxs
-          echo '      <UIRef Id="WixUI_InstallDir" />' >> streamlit_exe.wxs
-          echo '      <UIRef Id="WixUI_ErrorProgressText" />' >> streamlit_exe.wxs
-          echo '    </UI>' >> streamlit_exe.wxs
-                    
-                    # Provide license should exists in SourceDir folder
-          echo '    <WixVariable Id="WixUILicenseRtf" Value="SourceDir/dummy_license.rtf" />' >> streamlit_exe.wxs
-          echo '  </Product>' >> streamlit_exe.wxs
-          echo '</Wix>' >> streamlit_exe.wxs
+    - name: Generate WiX XML file
+      run: |
+        echo '<?xml version="1.0"?>' > streamlit_exe.wxs
+        echo '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">' >> streamlit_exe.wxs
+        echo '  <Product Id="*" Name="${{ env.APP_NAME }}" Language="1033" Version="1.0.0.0" Manufacturer="OpenMS" UpgradeCode="8d28e8c7-45dc-446c-b889-99a6aea2f1a5">' >> streamlit_exe.wxs
+        echo '    <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine"/>' >> streamlit_exe.wxs
+        echo '    <Media Id="1" Cabinet="streamlit.cab" EmbedCab="yes" />' >> streamlit_exe.wxs
+
+                  # Folder used 
+        echo '    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />' >> streamlit_exe.wxs
+        echo '    <Property Id="INSTALLFOLDER" Secure="yes" />' >> streamlit_exe.wxs
+        echo '    <Directory Id="TARGETDIR" Name="SourceDir">' >> streamlit_exe.wxs
+        echo '      <Directory Id="ProgramFilesFolder">' >> streamlit_exe.wxs
+        echo '        <Directory Id="INSTALLFOLDER" Name="StreamlitApp" />' >> streamlit_exe.wxs
+        echo '      </Directory>' >> streamlit_exe.wxs
+        echo '      <Directory Id="DesktopFolder" />' >> streamlit_exe.wxs
+        echo '    </Directory>' >> streamlit_exe.wxs
+
+                  # Add component 
+        echo '    <Feature Id="MainFeature" Title="Main Application" Level="1">' >> streamlit_exe.wxs
+        echo '      <ComponentGroupRef Id="StreamlitExeFiles" />' >> streamlit_exe.wxs
+        echo '      <ComponentRef Id="DesktopShortcutComponent" />' >> streamlit_exe.wxs
+        echo '      <ComponentRef Id="InstallDirShortcutComponent" />' >> streamlit_exe.wxs
+        echo '    </Feature>' >> streamlit_exe.wxs
+
+                  # Create shortcut for run App on Desktop
+        echo '    <Component Id="DesktopShortcutComponent" Guid="3597b243-9180-4d0b-b105-30d8b0d1a334" Directory="DesktopFolder">' >> streamlit_exe.wxs
+        echo '      <Shortcut Id="DesktopShortcut" Name="${{ env.APP_NAME }}" Description="Launch ${{ env.APP_NAME }}" Target="[INSTALLFOLDER]${{ env.APP_NAME }}.bat" WorkingDirectory="INSTALLFOLDER" Icon="AppIcon"/>' >> streamlit_exe.wxs
+        echo '      <RegistryValue Root="HKCU" Key="Software\OpenMS\${{ env.APP_NAME }}" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />' >> streamlit_exe.wxs
+        echo '    </Component>' >> streamlit_exe.wxs
+        
+                  # Create shortcut for run App in Installer folder
+        echo '    <Component Id="InstallDirShortcutComponent" Guid="c2df9472-3b45-4558-a56d-6034cf7c8b72" Directory="INSTALLFOLDER">' >> streamlit_exe.wxs
+        echo '      <Shortcut Id="InstallDirShortcut" Name="${{ env.APP_NAME }}" Description="Launch ${{ env.APP_NAME }}" Target="[INSTALLFOLDER]${{ env.APP_NAME }}.bat" WorkingDirectory="INSTALLFOLDER" Icon="AppIcon"/>' >> streamlit_exe.wxs
+        echo '      <RegistryValue Root="HKCU" Key="Software\OpenMS\${{ env.APP_NAME }}" Name="InstallFolderShortcut" Type="integer" Value="1" KeyPath="yes" />' >> streamlit_exe.wxs
+        echo '    </Component>' >> streamlit_exe.wxs
+        
+                  # Provide icon here, should exists in SourceDir folder
+        echo '    <Icon Id="AppIcon" SourceFile="SourceDir/openms.ico" />' >> streamlit_exe.wxs
+        
+                  # Create Bat file during installtion
+        echo '    <CustomAction Id="CreateBatFile" Directory="INSTALLFOLDER" Execute="deferred" Return="check"' >> streamlit_exe.wxs
+        echo '                  ExeCommand="cmd.exe /c echo @echo off &gt; [INSTALLFOLDER]${{ env.APP_NAME }}.bat &amp;&amp; echo [INSTALLFOLDER]python-${{ env.PYTHON_VERSION }}\\python.exe -m streamlit run [INSTALLFOLDER]app.py local &gt;&gt; [INSTALLFOLDER]${{ env.APP_NAME }}.bat" />' >> streamlit_exe.wxs
+                  
+                  # Run app directly after installation
+        echo '    <CustomAction Id="RunApp" Directory="INSTALLFOLDER" Execute="deferred" Return="asyncNoWait"' >> streamlit_exe.wxs
+        echo '                  ExeCommand="cmd.exe /c &quot;[INSTALLFOLDER]${{ env.APP_NAME }}.bat&quot;" />' >> streamlit_exe.wxs
+
+                  # Run Bat file during uninstallation
+        echo '    <CustomAction Id="RemoveBatFile" Directory="INSTALLFOLDER" Execute="deferred" Return="ignore"' >> streamlit_exe.wxs 
+        echo '                  ExeCommand="cmd.exe /c del /f /q [INSTALLFOLDER]${{ env.APP_NAME }}.bat&quot;" />' >> streamlit_exe.wxs
+                  
+                  # Add all Custom action
+        echo '    <InstallExecuteSequence>' >> streamlit_exe.wxs
+        echo '      <Custom Action="CreateBatFile" After="InstallFiles">NOT REMOVE</Custom>' >> streamlit_exe.wxs
+        echo '      <Custom Action="RunApp" Before="InstallFinalize">NOT REMOVE</Custom>' >> streamlit_exe.wxs
+        echo '      <Custom Action="RemoveBatFile" Before="RemoveFiles">REMOVE="ALL"</Custom>' >> streamlit_exe.wxs
+        echo '    </InstallExecuteSequence>' >> streamlit_exe.wxs
+        echo '    <UI>' >> streamlit_exe.wxs
+        echo '      <UIRef Id="WixUI_InstallDir" />' >> streamlit_exe.wxs
+        echo '      <UIRef Id="WixUI_ErrorProgressText" />' >> streamlit_exe.wxs
+        echo '    </UI>' >> streamlit_exe.wxs
+                  
+                  # Provide license should exists in SourceDir folder
+        echo '    <WixVariable Id="WixUILicenseRtf" Value="SourceDir/openms_license.rtf" />' >> streamlit_exe.wxs
+        echo '  </Product>' >> streamlit_exe.wxs
+        echo '</Wix>' >> streamlit_exe.wxs
 
     - name: Build msi
       run: |

diff --git a/.github/workflows/test-win-exe-w-embed-py.yaml b/.github/workflows/test-win-exe-w-embed-py.yaml
@@ -87,7 +87,7 @@ jobs:
         run: |
           mkdir SourceDir
           mv streamlit_exe/* SourceDir
-          cp dummy_license.rtf SourceDir
+          cp assets/openms_license.rtf SourceDir
           cp assets/openms.ico SourceDir
 
       - name: Generate WiX XML file
@@ -154,7 +154,7 @@ jobs:
           echo '    </UI>' >> streamlit_exe.wxs
                     
                     # Provide license should exists in SourceDir folder
-          echo '    <WixVariable Id="WixUILicenseRtf" Value="SourceDir/dummy_license.rtf" />' >> streamlit_exe.wxs
+          echo '    <WixVariable Id="WixUILicenseRtf" Value="SourceDir/openms_license.rtf" />' >> streamlit_exe.wxs
           echo '  </Product>' >> streamlit_exe.wxs
           echo '</Wix>' >> streamlit_exe.wxs