Commit 9819384b authored by fbomj's avatar fbomj Committed by GitHub

Merge pull request #247 from OCSInventory-NG/macos_installer_rework

Macos installer rework
parents 970169e2 c6e7f718
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19D76</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>config</string>
<key>CFBundleIdentifier</key>
<string>org.ocsinventory.agent.config</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>config</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11C504</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>19B90</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1130</string>
<key>DTXcodeBuild</key>
<string>11C504</string>
<key>InstallerSectionTitle</key>
<string>config</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2020 OCS Inventory. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>ConfigInstallerPane</string>
<key>NSPrincipalClass</key>
<string>InstallerSection</string>
</dict>
</plist>
......@@ -2,15 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SectionOrder</key>
<array>
<string>Introduction</string>
<string>ReadMe</string>
<string>License</string>
<string>Configuration</string>
<string>Target</string>
<string>PackageSelection</string>
<string>Install</string>
</array>
<key>SectionOrder</key>
<array>
<string>Introduction</string>
<string>ReadMe</string>
<string>License</string>
<string>config.bundle</string>
<string>Target</string>
<string>PackageSelection</string>
<string>Install</string>
</array>
</dict>
</plist>
/* Class = "NSButtonCell"; title = "SSL check"; ObjectID = "0JY-Jz-90N"; */
"0JY-Jz-90N.title" = "SSL check";
/* Class = "NSTextFieldCell"; title = "ocsinventory-ng"; ObjectID = "0Sw-Bb-gYo"; */
"0Sw-Bb-gYo.title" = "ocsinventory-ng";
/* Class = "NSButtonCell"; title = "Debug mode"; ObjectID = "31X-X1-h1b"; */
"31X-X1-h1b.title" = "Debug mode";
/* Class = "NSMenuItem"; title = "http://"; ObjectID = "3w5-Xc-SgN"; */
"3w5-Xc-SgN.title" = "http://";
/* Class = "NSTextFieldCell"; title = "Log File path :"; ObjectID = "Bqz-yE-1gz"; */
"Bqz-yE-1gz.title" = "Log File path :";
/* Class = "NSTextFieldCell"; title = "TAG Value (optional) :"; ObjectID = "CJY-Du-ySH"; */
"CJY-Du-ySH.title" = "TAG Value (optional) :";
/* Class = "NSTextFieldCell"; title = "/ocsinventory"; ObjectID = "DIf-zY-Upa"; */
"DIf-zY-Upa.title" = "/ocsinventory";
/* Class = "NSButtonCell"; title = "Deployment feature"; ObjectID = "Fz6-ny-C1b"; */
"Fz6-ny-C1b.title" = "Deployment feature";
/* Class = "NSButtonCell"; title = "Browse"; ObjectID = "MAB-ch-ni8"; */
"MAB-ch-ni8.title" = "Browse";
/* Class = "NSTextFieldCell"; title = "Certificate File (needed by 'Deployment feature')"; ObjectID = "UvL-Ff-Y6G"; */
"UvL-Ff-Y6G.title" = "Certificate File (needed by 'Deployment feature')";
/* Class = "NSButtonCell"; title = "Lazy mode"; ObjectID = "gFK-QK-e24"; */
"gFK-QK-e24.title" = "Lazy mode";
/* Class = "NSTextFieldCell"; title = "OCS Server URL"; ObjectID = "w48-wL-2Wx"; */
"w48-wL-2Wx.title" = "OCS Server URL";∂
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/Base.lproj/ConfigInstallerPane.nib</key>
<data>
l8zcaJESf2WEryTIkN6KaenTARI=
</data>
<key>Resources/InstallerSections.plist</key>
<data>
LpXhZ1VvF2siFxs4mpia0PCnR5c=
</data>
<key>Resources/en.lproj/ConfigInstallerPane.strings</key>
<dict>
<key>hash</key>
<data>
PzyXIbbioRBe8IB10xAeUcFqpQs=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/InfoPlist.strings</key>
<dict>
<key>hash</key>
<data>
KjbuOb4lqm/uiqKFnyUAUqhTfKQ=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
m6w4i8zyDoQz37Wax6vL4HBa3Lk=
</data>
<key>optional</key>
<true/>
</dict>
</dict>
<key>files2</key>
<dict>
<key>Resources/Base.lproj/ConfigInstallerPane.nib</key>
<dict>
<key>hash2</key>
<data>
f5WqT/uWCDHaQ9NyjvgZE99L0Y4X6qJ6SxrrMuvUTiQ=
</data>
</dict>
<key>Resources/InstallerSections.plist</key>
<dict>
<key>hash2</key>
<data>
luK21Ws/HQdlP/xeZXZ1Sw+m/repA8RbW72bm8ELOY8=
</data>
</dict>
<key>Resources/en.lproj/ConfigInstallerPane.strings</key>
<dict>
<key>hash2</key>
<data>
5ou2+oxEv8fJwzCru3W2EWlaOFIzIqxLzlRIvJe3A/Y=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/InfoPlist.strings</key>
<dict>
<key>hash2</key>
<data>
KQQbL7yg0pVKzwqwiD7sT3VAy5Pik/w/gtKizZSSzYc=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/Localizable.strings</key>
<dict>
<key>hash2</key>
<data>
jVwd52Zgtjk0de+f9zdgvJRvbNHadUyNTZZeuzeqnRc=
</data>
<key>optional</key>
<true/>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19D76</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>daemonconfig</string>
<key>CFBundleIdentifier</key>
<string>org.ocsinventory.agent.daemonconfig</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>daemonconfig</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11C504</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>19B90</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1130</string>
<key>DTXcodeBuild</key>
<string>11C504</string>
<key>InstallerSectionTitle</key>
<string>daemonconfig</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2020 OCS Inventory. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>DaemonConfigPane</string>
<key>NSPrincipalClass</key>
<string>InstallerSection</string>
</dict>
</plist>
......@@ -2,13 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildVersion</key>
<string>2</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>ProjectName</key>
<string>DevToolsWizardTemplates</string>
<key>SourceVersion</key>
<string>3670000</string>
<key>SectionOrder</key>
<array>
<string>Introduction</string>
<string>ReadMe</string>
<string>License</string>
<string>daemonconfig.bundle</string>
<string>Target</string>
<string>PackageSelection</string>
<string>Install</string>
</array>
</dict>
</plist>
/* Class = "NSTextFieldCell"; title = "Launch OCS agent every"; ObjectID = "CR7-Av-TyG"; */
"CR7-Av-TyG.title" = "Launch OCS agent every";
/* Class = "NSTextFieldCell"; title = "5"; ObjectID = "Kd5-vS-SZ8"; */
"Kd5-vS-SZ8.title" = "5";
/* Class = "NSTextFieldCell"; title = "hour(s)"; ObjectID = "L5X-oH-TrN"; */
"L5X-oH-TrN.title" = "hour(s)";
/* Class = "NSButtonCell"; title = "Launch OCS Agent at daemon start"; ObjectID = "dlF-LS-rTI"; */
"dlF-LS-rTI.title" = "Launch OCS Agent at daemon start";
/* Class = "NSButtonCell"; title = "Launch daemon after install"; ObjectID = "kI2-ox-p1X"; */
"kI2-ox-p1X.title" = "Launch daemon after install";
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/Base.lproj/DaemonConfigPane.nib</key>
<data>
Pu4PmcDFtaJLc1EkcDgVrS9crXA=
</data>
<key>Resources/InstallerSections.plist</key>
<data>
FmRNRuAEAYqK2RpLIFeIg+9+eiU=
</data>
<key>Resources/en.lproj/DaemonConfigPane.strings</key>
<dict>
<key>hash</key>
<data>
eiGDqgREZn8HceRx9B8K/gkZH04=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/InfoPlist.strings</key>
<dict>
<key>hash</key>
<data>
Ap5X6SZrkIlC/1YsU77r6gFzm/k=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
QfqBhmtEWE7k7/JEDj9TMckLuYY=
</data>
<key>optional</key>
<true/>
</dict>
</dict>
<key>files2</key>
<dict>
<key>Resources/Base.lproj/DaemonConfigPane.nib</key>
<dict>
<key>hash2</key>
<data>
sWdxk/B8D7oofAZaGimwxEp5vEwWzzHK/o6ixyak0D0=
</data>
</dict>
<key>Resources/InstallerSections.plist</key>
<dict>
<key>hash2</key>
<data>
2P+v0n1PTQjdpYze2cgaBZ20QzsklEInKYnQFbgHigo=
</data>
</dict>
<key>Resources/en.lproj/DaemonConfigPane.strings</key>
<dict>
<key>hash2</key>
<data>
ch/7In9R0lRrq8IKXcyfgevRJNnS6wGSfc70wd5AN9c=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/InfoPlist.strings</key>
<dict>
<key>hash2</key>
<data>
GWlsYxdk4Xhflv7F+rV96boG3puquJ6R2TTtqmKzkIc=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/en.lproj/Localizable.strings</key>
<dict>
<key>hash2</key>
<data>
F5eHWu45VUsWfzZPxEBjkaB/9TJLEZToW7wQmQs25Cc=
</data>
<key>optional</key>
<true/>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## User settings
xcuserdata/
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
## Gcc Patch
/*.gcno