osd_4.3.5.1_to_main

Author: doertel-uib

opsi-misc/opsisetupdetector/changelog-osd.txt

@@ -143,6 +143,25 @@ todo:
    *
 
 # Changelog opsi-setup-detector
+## [4.3.5.1-1] - 2025-04-16
+
+### Fix
+- markdown typo in msix info
+
+(Detlef Oertel <[email protected]>)
+
+## [4.3.5.0-1] - 2025-03-21
+
+### Fix
+- more logging in  osdform:BtCreateProductClick for build or not build
+- change meta data according to
+  '2024-OTW18-PRODUCT-METADATASTRUCTURE' VERSION 0.1.6: 13.11.2024
+- osdanalyzewin: get_inno_info: detect architecture from iss file or installdir
+- osdanalyzewin: get_QtInstaller_info assume architecture is x64
+
+
+(Detlef Oertel <[email protected]>)
+
 ## [4.3.4.2-1] - 2024-11-05
 
 ### Fix

opsi-misc/opsisetupdetector/info-osd.plist

@@ -13,7 +13,7 @@
   <key>CFBundleName</key>
   <string>opsisetupdetector</string>
   <key>CFBundleShortVersionString</key>
-  <string>4.3.4.0</string>
+  <string>4.3.5.1</string>
   <key>CFBundleIconFile</key>
   <string>opsisetupdetector.icns</string>
   <key>CFBundleVersion</key>

opsi-misc/opsisetupdetector/opsisetupdetector.lpi

@@ -30,8 +30,8 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="4"/>
       <MinorVersionNr Value="3"/>
-      <RevisionNr Value="4"/>
-      <BuildNr Value="2"/>
+      <RevisionNr Value="5"/>
+      <BuildNr Value="1"/>
       <StringTable CompanyName="uib gmbh (uib.de / opsi.org)" FileDescription="opsi setup detector" InternalName="opsi setup detector" LegalCopyright="AGPLv3" LegalTrademarks="opsi, opsi.org, open system integration" OriginalFilename="opsisetupdetector" ProductName="opsi" ProductVersion="opsi 4.3"/>
     </VersionInfo>
     <BuildModes Count="6">

opsi-misc/opsisetupdetector/osdanalyzewin.pas

@@ -21,6 +21,7 @@ interface
   strutils,
   SysUtils,
   fileinfo,
+  typinfo,
   winpeimagereader,
   oslog,
   osdbasedata,
@@ -604,6 +605,10 @@ procedure get_inno_info(myfilename: string; var mysetup: TSetupFile);
   destfile := ExtractFileName(myfilename);
   destfile := ExtractFileName(destfile);
   installScriptISS := destDir + DirectorySeparator + 'install_script.iss';
+  // innounp works only until inno version 6.1  (Supports Inno Setup versions 2.0.7 through 6.1.2)
+  // inno version > 6.2 needs innounp-2
+  // https://www.rathlev-home.de/index-e.html?tools/prog-e.html#unpack
+  // https://www.rathlev-home.de/tools/download/innounp-2.zip
 
   LogDatei.log('extract install_script.iss from ' + myfilename + ' to', LLInfo);
   LogDatei.log(installScriptISS, LLInfo);
@@ -705,11 +710,18 @@ procedure get_inno_info(myfilename: string; var mysetup: TSetupFile);
         (0 = pos('x86', lowercase(ArchitecturesInstallIn64BitMode))) then
       begin
         DefaultDirName := translateInnoConstants(DefaultDirName, '64');
+        mysetup.architecture:= a64;
       end
       else
       begin
         DefaultDirName := translateInnoConstants(DefaultDirName, '32');
+        mysetup.architecture:= a32;
       end;
+      // guess architecture from installdir
+  if DefaultDirName.StartsWith('%ProgramFiles64Dir%') then
+    mysetup.architecture := a64
+  else if DefaultDirName.StartsWith('%ProgramFiles32Dir%') then
+    mysetup.architecture := a32;
       mysetup.installDirectory := DefaultDirName;
       if UninstallFilesDir <> '' then
       begin
@@ -732,6 +744,7 @@ procedure get_inno_info(myfilename: string; var mysetup: TSetupFile);
       begin
         LogDatei.log('installDirectory: ' + installDirectory, LLDebug);
         LogDatei.log('SoftwareVersion: ' + SoftwareVersion, LLDebug);
+        LogDatei.log('Architecture: ' + GetEnumName(typeInfo(TArchitecture), Ord(architecture)), LLDebug);
       end;
       with aktProduct.productdata do
       begin
@@ -1085,13 +1098,14 @@ procedure get_QtInstaller_info(myfilename: string; var mysetup: TSetupFile);
 begin
   write_log_and_memo('Analyzing QtInstaller:');
   mysetup.installDirectory := '%Programfiles64Dir%\"+$ProductId$+"';
+  mysetup.architecture:= a64;
   write_log_and_memo('get_QtInstaller_info finished');
 end;
 
 procedure get_MsixAppx_info(myfilename: string; var mysetup: TSetupFile);
 var
   packagepath, cmdStr, versionStr, fullNameStr, displayNameStr: string;
-  destDir, proptmpstr: string;
+  destDir, proptmpstr, architectureStr: string;
   xmlLines, nodeLines: TStringList;
   manifesFileName : string;
   i : integer;
@@ -1138,6 +1152,18 @@ procedure get_MsixAppx_info(myfilename: string; var mysetup: TSetupFile);
         end
         else
           LogDatei.log('Could not get FullName from AppxManifest.xml.', LLwarning);
+        if getXml2AttributeValueByKey(nodeLines, 'ProcessorArchitecture', architectureStr) then
+        begin
+          if architectureStr = 'X86' then mysetup.architecture:= a32
+          else if architectureStr = 'X64' then mysetup.architecture:= a64
+          else if architectureStr = 'Neutral' then mysetup.architecture:= aUnknown
+          else mysetup.architecture:= aUnknown;
+          LogDatei.log('Got Architecture: ' + architectureStr +
+            ' from node Identity in AppxManifest.xml', LLnotice);
+          LogDatei.log('Architecture: ' + GetEnumName(typeInfo(TArchitecture), Ord(mysetup.architecture)), LLDebug);
+        end
+        else
+          LogDatei.log('Could not get Architecture from AppxManifest.xml.', LLwarning);
       end
       else
         LogDatei.log('Could not get node Identity from AppxManifest.xml.', LLwarning);

opsi-misc/opsisetupdetector/osdbasedata.pas

@@ -108,7 +108,7 @@   TOSDSettings = class(TPersistent)
     amSelectable);
 
   // marker for add installers
-  TKnownInstaller = (stWinget,stMsixAppx, stWise,
+  TKnownInstaller = (stWinget, stMsixAppx, stWise,
     stQtInstaller,
     stSetupFactory,
     stInstallAnywhere,
@@ -203,8 +203,10 @@   TSetupFile = class(TPersistent)
     //Fwinbatch_del_argument: string;
     FinstallCommandLine: string;   // command line to install the software
     FuninstallCommandLine: string; // command line to uninstall the software
-    FinstallCommandStringEx: string;   // String expression for prim section to install the software
-    FuninstallCommandStringEx: string; // String expression for prim section to uninstall the software
+    FinstallCommandStringEx: string;
+    // String expression for prim section to install the software
+    FuninstallCommandStringEx: string;
+    // String expression for prim section to uninstall the software
     FuninstallProg: string;        // path + name of the uninstall.prog
     FuninstallDirectory: string;   // dir of the uninstall.prog
     FtargetProg: string;
@@ -277,17 +279,18 @@   TSetupFile = class(TPersistent)
       read FisExitcodeFatalFunction write FisExitcodeFatalFunction;
     property uninstallCommandLine: string read FuninstallCommandLine
       write FuninstallCommandLine;
-    property installCommandStringEx: string read FinstallCommandStringEx
-      write FinstallCommandStringEx;
-    property uninstallCommandStringEx: string read FuninstallCommandStringEx
-      write FuninstallCommandStringEx;
+    property installCommandStringEx: string
+      read FinstallCommandStringEx write FinstallCommandStringEx;
+    property uninstallCommandStringEx: string
+      read FuninstallCommandStringEx write FuninstallCommandStringEx;
 
     property uninstallProg: string read FuninstallProg write SetUninstallProg;
     property uninstallDirectory: string read FuninstallDirectory
       write SetUninstallDirectory;
     property targetProg: string read FtargetProg write SetTargetProg;
     property uninstallCheck: TStrings read FuninstallCheck write SetUninstallCheck;
-    property optionalUninstallLines: TStrings read FoptionalUninstallLines write SetOptionalUninstallLines;
+    property optionalUninstallLines: TStrings
+      read FoptionalUninstallLines write SetOptionalUninstallLines;
     property uninstall_waitforprocess: string
       read Funinstall_waitforprocess write Funinstall_waitforprocess;
     property install_waitforprocess: string
@@ -553,7 +556,7 @@   TConfiguration = class(TPersistent)
     Fdependencies_for_all_actionrequests: boolean;
     // since opsi 4.3 dependecies are allowed for all action requests
     FpreferMsiUninstall: boolean; // true=prefer uninstall via msi if possible
-    FwriteMetaDataFile : boolean;  // true=write opsi-meta-data.toml file
+    FwriteMetaDataFile: boolean;  // true=write opsi-meta-data.toml file
     procedure SetLibraryLines(const AValue: TStrings);
     procedure SetPreInstallLines(const AValue: TStrings);
     procedure SetPostInstallLines(const AValue: TStrings);
@@ -817,21 +820,24 @@ procedure reload_installer_info_messages;
     LineEnding + 'You may use this msi as install file.' + LineEnding +
     'You may perhaps also pass the msi parameters as arguments to your setup.exe.';
   mdInstallerInfo_MsixAppx =
-    '## This is a Msix / Appx / AppxBundle / MsixBundle file.' + LineEnding +
-    'This kind of packages may be installed via powershell.' + LineEnding +
-    LineEnding + 'In order to check for the dependecies of this package' + LineEnding +
-    'and if this package is aviable from MS store,' + LineEnding +
-    LineEnding + 'then you may use the following web site to check and download' + LineEnding +
-    LineEnding + 'missing packages: ' + LineEnding +
+    '## This is a Msix / Appx / AppxBundle / MsixBundle file.' +
+    LineEnding + 'This kind of packages may be installed via powershell.' +
+    LineEnding + LineEnding + 'In order to check for the dependecies of this package' +
+    LineEnding + 'and if this package is aviable from MS store,' +
+    LineEnding + LineEnding +
+    'then you may use the following web site to check and download' +
+    LineEnding + LineEnding + 'missing packages: ' + LineEnding +
     LineEnding + '<https://store.rg-adguard.net/>' + LineEnding +
-    LineEnding + 'There also is often a problem with the uninstallation.' + LineEnding +
-    LineEnding + 'So the use of the "uninstall_before_install" checkbox is recommended.';
+    LineEnding + 'There also is often a problem with the uninstallation.' +
+    LineEnding + LineEnding +
+    'So the use of the "uninstall\_before\_install" checkbox is recommended.';
   mdInstallerInfo_winget =
     '## Making a winget based package.' + LineEnding + LineEnding +
-    'You need to know the winget Id and Source of the software to install.' + LineEnding +
-    LineEnding + 'A tool that may help you to find this data is:' + LineEnding + LineEnding +
-    'UniGetUI (formerly WingetUI), The Graphical Interface for your package managers' + LineEnding + LineEnding +
-    '<https://www.marticliment.com/unigetui/>' ;
+    'You need to know the winget Id and Source of the software to install.' +
+    LineEnding + LineEnding + 'A tool that may help you to find this data is:' +
+    LineEnding + LineEnding +
+    'UniGetUI (formerly WingetUI), The Graphical Interface for your package managers' +
+    LineEnding + LineEnding + '<https://www.marticliment.com/unigetui/>';
   // marker for add installers
 
 implementation
@@ -1588,17 +1594,27 @@ procedure TopsiProduct.readProjectFile(filename: string);
           if jsonIsValid(JSONString) then
           begin
             jsonAsObjectGetValueByKey(JSONString, 'Items', JSONString);
+            if Assigned(logdatei) then
+              logdatei.log('Import property JSONString: ' + JSONString, LLDebug);
             if jsonIsArray(JSONString) then
             begin
-              aktproperty := TPProperty.Create;
+              aktProduct.properties.Clear;
+              //if Assigned(logdatei) then
+              //logdatei.log('count: ' + inttostr(jsonAsArrayCountElements(JSONString) - 1), LLDebug);
+              //   if jsonAsArrayCountElements(JSONString) > 0 then
               for i := 0 to jsonAsArrayCountElements(JSONString) - 1 do
               begin
+                aktproperty := TPProperty.Create;
                 jsonAsArrayGetElementByIndex(JSONString, i, JSONObjString);
+                // if Assigned(logdatei) then
+                // logdatei.log('JSONObjString: ' + JSONObjString, LLDebug);
                 aktproperty := aktProduct.properties.Add;
-                DeStreamer.JSONToObject(JSONObjString, aktproperty);
-
+                //DeStreamer.JSONToObject(JSONObjString, aktproperty);
+                DeStreamer.JSONToObject(JSONObjString, aktProduct.properties.Items[i]);
+                if Assigned(logdatei) then
+                  logdatei.log('Property_Name: ' +
+                    aktProduct.properties.Items[i].Property_Name, LLDebug);
               end;
-              if Assigned(aktproperty) then FreeAndNil(aktproperty);
             end;
           end;
         deactivateImportMode;

opsi-misc/opsisetupdetector/osdform.lfm

@@ -1,7 +1,7 @@
 object resultForm1: TresultForm1
-  Left = 376
+  Left = 112
   Height = 674
-  Top = 179
+  Top = 393
   Width = 1278
   Caption = 'opsi Setup Detector'
   ClientHeight = 674
@@ -166,12 +166,12 @@ object resultForm1: TresultForm1
       Height = 611
       Top = 0
       Width = 1046
-      ActivePage = TabSheetSetup1
+      ActivePage = TabSheetStart
       Align = alClient
       Images = ImageList1
       ParentFont = False
       ShowTabs = False
-      TabIndex = 2
+      TabIndex = 0
       TabOrder = 0
       OnChange = PageControl1Change
       object TabSheetStart: TTabSheet
@@ -13248,10 +13248,10 @@ object resultForm1: TresultForm1
                 TIOptions = [tgoStartIndexAtOne, tgoShowOnlyProperties]
                 ColWidths = (
                   64
-                  125
-                  125
-                  124
-                  124
+                  129
+                  129
+                  129
+                  128
                 )
               end
               object PanelDepBtns: TPanel
@@ -13674,10 +13674,10 @@ object resultForm1: TresultForm1
                 TIOptions = [tgoStartIndexAtOne, tgoShowOnlyProperties]
                 ColWidths = (
                   64
-                  238
-                  238
-                  238
-                  237
+                  242
+                  242
+                  242
+                  242
                 )
               end
             end

opsi-misc/opsisetupdetector/osdform.pas

@@ -3093,9 +3093,18 @@ procedure TResultform1.BtCreateProductClick(Sender: TObject);
     done := createProductStructure;
     procmess;
     case TIRadioGroupCreateMode.ItemIndex of
-      0: ; // do nothing else
-      1: callServiceOrPackageBuilder;
-      2: callOpsiPackageBuilder;
+      0: begin
+        logdatei.log('Create Mode is files only - so we finished', LLnotice);
+      end; // do nothing else
+      1: begin
+        logdatei.log('Create Mode is files and build - so we try to call the service', LLnotice);
+        callServiceOrPackageBuilder;
+      end;
+      2: begin
+        logdatei.log('Create Mode is files and interactive packageBuilder - so we try to call the opsiPackageBuilder', LLnotice);
+        callOpsiPackageBuilder;
+
+      end;
     end;
     (*
     if RadioButtonCreateOnly.Checked then
@@ -3762,7 +3771,8 @@ procedure TResultform1.MenuItemAboutClick(Sender: TObject);
 begin
   list := TStringList.Create;
   progname := ExtractFileName(ParamStr(0));
-  msg := progname + ' Version: ' + myVersion;
+  msg := progname + ' Version: ' + myVersion + '      ('+{$i %DATE%} + ', ' +{$i %TIME%}+')';
+  //msg := progname + ' Version: ' + myVersion;
   list.Add(msg);
   list.Add('(c) uib gmbh under AGPLv3');
   list.Add('This is a part of the opsi.org project: https://opsi.org');