Update project to 2.8

OCSInventory-NG · Nov 6, 2020 · 92a72a6 · 92a72a6
1 parent cb2f384
commit 92a72a6
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 14 deletions.
diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
diff --git a/Info.plist b/Info.plist
@@ -17,11 +17,13 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>0.8</string>
+ <string>$(MARKETING_VERSION)</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>0.8</string>
+ <string>$(CURRENT_PROJECT_VERSION)</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.developer-tools</string>
  <key>NSMainNibFile</key>
  <string>ConfigurationWindow</string>
  <key>NSPrincipalClass</key>

diff --git a/ocs_macosx_agent_packager.xcodeproj/project.pbxproj b/ocs_macosx_agent_packager.xcodeproj/project.pbxproj
@@ -88,7 +88,7 @@
  29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
  32CA4F630368D1EE00C91783 /* ocs_macosx_agent_packager_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ocs_macosx_agent_packager_Prefix.pch; sourceTree = "<group>"; };
  8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
- 8D1107320486CEB800E47090 /* OcsInventory_MacOSX_Packager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OcsInventory_MacOSX_Packager.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8D1107320486CEB800E47090 /* ocs_macosx_agent_packager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ocs_macosx_agent_packager.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -142,7 +142,7 @@
  19C28FACFE9D520D11CA2CBB /* Products */ = {
  isa = PBXGroup;
  children = (
- 8D1107320486CEB800E47090 /* OcsInventory_MacOSX_Packager.app */,
+ 8D1107320486CEB800E47090 /* ocs_macosx_agent_packager.app */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -212,7 +212,7 @@
  name = ocs_macosx_agent_packager;
  productInstallPath = "$(HOME)/Applications";
  productName = ocs_agent_packager;
- productReference = 8D1107320486CEB800E47090 /* OcsInventory_MacOSX_Packager.app */;
+ productReference = 8D1107320486CEB800E47090 /* ocs_macosx_agent_packager.app */;
  productType = "com.apple.product-type.application";
  };
 /* End PBXNativeTarget section */
@@ -316,7 +316,9 @@
  C01FCF4B08A954540054247B /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
  COPY_PHASE_STRIP = NO;
+ CURRENT_PROJECT_VERSION = 1.0;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -332,7 +334,9 @@
  GCC_OPTIMIZATION_LEVEL = 0;
  INFOPLIST_FILE = Info.plist;
  INSTALL_PATH = "$(HOME)/Applications";
+ MARKETING_VERSION = 1.0;
  PRODUCT_NAME = ocs_macosx_agent_packager;
+ SDKROOT = macosx;
  WRAPPER_EXTENSION = app;
  ZERO_LINK = YES;
  };
@@ -341,11 +345,8 @@
  C01FCF4C08A954540054247B /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
- ARCHS = (
- ppc,
- i386,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CURRENT_PROJECT_VERSION = 1.0;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -359,7 +360,9 @@
  GCC_MODEL_TUNING = G5;
  INFOPLIST_FILE = Info.plist;
  INSTALL_PATH = "$(HOME)/Applications";
+ MARKETING_VERSION = 1.0;
  PRODUCT_NAME = OcsInventory_MacOSX_Packager;
+ SDKROOT = macosx;
  WRAPPER_EXTENSION = app;
  };
  name = Release;
@@ -371,9 +374,10 @@
  i386,
  ppc,
  );
- GCC_VERSION = 4.0;
+ GCC_VERSION = "";
  GCC_WARN_ABOUT_RETURN_TYPE = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
  PREBINDING = NO;
  SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
  };
@@ -388,11 +392,11 @@
  x86_64,
  );
  CURRENT_PROJECT_VERSION = "";
- GCC_VERSION = 4.0;
+ GCC_VERSION = "";
  GCC_WARN_ABOUT_RETURN_TYPE = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
- "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
+ "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.13;
  PREBINDING = NO;
  PRODUCT_NAME = Ocsinventory_MacOSX_Packager;
  SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";

diff --git a/ocs_macosx_agent_packager.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ocs_macosx_agent_packager.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...macosx_agent_packager.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...macosx_agent_packager.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>
diff --git a/...roject.xcworkspace/xcuserdata/factorfxfactorfx.xcuserdatad/UserInterfaceState.xcuserstate b/...roject.xcworkspace/xcuserdata/factorfxfactorfx.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...ager.xcodeproj/xcuserdata/factorfxfactorfx.xcuserdatad/xcschemes/xcschememanagement.plist b/...ager.xcodeproj/xcuserdata/factorfxfactorfx.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+ <dict>
+ <key>ocs_macosx_agent_packager.xcscheme_^#shared#^_</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+</dict>
+</plist>