Disable pack for mobile (#131)

CMakeLists.txt

@@ -31,7 +31,7 @@ option(USE_VALIDATION_PARSER "Turn on to validates using the resouce schemas. De
 option(USE_SHARED_ZLIB "Choose the type of dependency for zlib, Use the -DUSE_SHARED_ZLIB=on to have a shared dependency. Default is 'off' (static)" OFF)
 option(USE_STATIC_MSVC "Windows only. Pass /MT as a compiler flag to use the staic version of the run-time library. Default is 'off' (dynamic)" OFF)
 option(SKIP_BUNDLES "Removes bundle functionality from the MSIX SDK. Default is 'off'" OFF)
-option(MSIX_PACK "Include packaging features for the MSIX SDK. Default is 'on'" ON)
+option(MSIX_PACK "Include packaging features for the MSIX SDK. Not supported for mobile. Default is 'on'" ON)
 
 set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel.  Use the -DCMAKE_BUILD_TYPE=[option] to specify.")
 set(XML_PARSER "" CACHE STRING "Choose the type of parser, options are: [xerces, msxml6, javaxml].  Use the -DXML_PARSER=[option] to specify.")
@@ -216,6 +216,12 @@ endif()
 
 enable_testing() # needed on top-level CMakeLists.txt
 
+# Packing is not enabled for mobile devices
+if(MSIX_PACK AND (AOSP OR IOS))
+    set(MSIX_PACK OFF)
+    message(STATUS "Packaging is not supported for mobile devices.")
+endif()
+
 # If not defined as a cmake argument do a best effort
 if(NOT XML_PARSER)
     include(CheckIncludeFileCXX)

makeaosp.sh

@@ -11,12 +11,11 @@ dataCompressionLib=NDK_libz
 bundle=off
 xmlparser=javaxml
 validationParser=off
-pack=on
 
 usage()
 {
     echo "usage: makeaosp [options]"
-    echo $'\t' "-ndk ndk_pack           Path to Android NDK. Default $ANDROID_NDK_ROOT or $ANDROID_NDK"
+    echo $'\t' "-ndk ndk_path           Path to Android NDK. Default $ANDROID_NDK_ROOT or $ANDROID_NDK"
     echo $'\t' "-ndkver ndk_version     Android NDK version. Default/minimum 19."
     echo $'\t' "-sdk sdk_path           Path to Android SDK. Default $ANDROID_HOME."
     echo $'\t' "-sdkver sdk_version     Android SDK version. Default/minimum 24."
@@ -26,7 +25,6 @@ usage()
     echo $'\t' "-parser-xerces          Use xerces xml parser instead of default javaxml"
     echo $'\t' "-sb                     Skip bundle support."
     echo $'\t' "--validation-parser|-vp Enable XML schema validation."
-    echo $'\t' "--no-pack               Don't include packaging features."
 }
 
 printsetup()
@@ -41,7 +39,6 @@ printsetup()
     echo "parser:" $xmlparser
     echo "Skip bundle support:" $bundle
     echo "Validation parser:" $validationParser
-    echo "Pack:" $pack
 }
 
 while [ "$1" != "" ]; do
@@ -79,8 +76,6 @@ while [ "$1" != "" ]; do
                 ;;
         -vp )   validationParser=on
                 ;;
-        --no-pack ) pack=off
-                    ;;
         * )       usage
                   exit 1
     esac
@@ -119,7 +114,7 @@ find . -name *msix* -d | xargs rm -r
 echo "cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK="$ndk "-DCMAKE_SYSTEM_VERSION="$version "-DANDROID_SDK="$sdk
 echo "-DANDROID_SDK_VERSION="$sdkver "-DCMAKE_ANDROID_ARCH_ABI="$arch "-DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang"
 echo "-DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_BUILD_TYPE="$build "-DSKIP_BUNDLES="$bundle "-DXML_PARSER="$xmlparser
-echo "-DUSE_VALIDATION_PARSER="$validationParser "-DMSIX_PACK="$pack $zlib "-DAOSP=on .."
+echo "-DUSE_VALIDATION_PARSER="$validationParser $zlib "-DAOSP=on .."
 cmake -DCMAKE_SYSTEM_NAME=Android \
     -DCMAKE_ANDROID_NDK="$ndk" \
     -DCMAKE_SYSTEM_VERSION="$version" \
@@ -132,6 +127,5 @@ cmake -DCMAKE_SYSTEM_NAME=Android \
     -DSKIP_BUNDLES=$bundle \
     -DXML_PARSER=$xmlparser \
     -DUSE_VALIDATION_PARSER=$validationParser \
-    -DMSIX_PACK=$pack \
     $zlib -DAOSP=on ..
 make

makeios.sh

@@ -6,18 +6,16 @@ dataCompressionLib=libcompression
 bundle=off
 xmlparser=applexml
 validationParser=off
-pack=on
 
 usage()
 {
     echo "usage: makemac [options]"
     echo $'\t' "-b build_type           Default MinSizeRel"
     echo $'\t' "-arch arch              OSX Architecture. Default x86_64 (simulator)"
-    echo $'\t' "-xzlib                  Use MSIX SDK Zlib instead of inbox libCompression api. Default on iOS is libCompression. Required for pack support."
+    echo $'\t' "-xzlib                  Use MSIX SDK Zlib instead of inbox libCompression api. Default on iOS is libCompression."
     echo $'\t' "-sb                     Skip bundle support."
     echo $'\t' "-parser-xerces          Use xerces xml parser instead of default apple xml parser."
     echo $'\t' "--validation-parser|-vp Enable XML schema validation."
-    echo $'\t' "--no-pack               Don't include packaging features."
 }
 
 printsetup()
@@ -28,7 +26,6 @@ printsetup()
     echo "Skip bundle support:" $bundle
     echo "Parser:" $xmlparser
     echo "Validation parser:" $validationParser
-    echo "Pack support:" $pack 
 }
 
 while [ "$1" != "" ]; do
@@ -51,8 +48,6 @@ while [ "$1" != "" ]; do
                 ;;
         -vp )   validationParser=on
                 ;;
-        --no-pack ) pack=off
-                    ;;
         -h )    usage
                 exit
                 ;;
@@ -77,6 +72,5 @@ cmake -DCMAKE_BUILD_TYPE=$build \
     -DXML_PARSER=$xmlparser \
     -DUSE_VALIDATION_PARSER=$validationParser \
     -DSKIP_BUNDLES=$bundle \
-    -DMSIX_PACK=$pack \
     $zlib -DIOS=on .. 
 make

pipelines/azure-pipelines-aosp.yml

@@ -43,9 +43,6 @@ jobs:
       release_arm:
         _arguments: -b MinSizeRel -arch armeabi-v7a 
         _artifact: AOSP-arm
-      debug_emulator_nopack:
-        _arguments: -b Debug --no-pack
-        _artifact: AOSP-x86chk-nopack
   steps:
   - task: Bash@3
     displayName: Build

pipelines/azure-pipelines-ios.yml

@@ -35,17 +35,14 @@ jobs:
     # TODO: add builds using xerces if needed.
     matrix:
       debug_x86:
-        _arguments: -b Debug -xzlib
+        _arguments: -b Debug
         _artifact: iOS-x86chk
       release_x86:
-        _arguments: -b MinSizeRel -xzlib
+        _arguments: -b MinSizeRel
         _artifact: iOS-x86
       release_arm64:
-        _arguments: -b MinSizeRel -arch arm64 -xzlib
+        _arguments: -b MinSizeRel -arch arm64
         _artifact: iOS-arm64
-      debug_x86_nopack:
-        _arguments: -b Debug --no-pack
-        _artifact: iOS-x86chk-nopack
   steps:
   - task: Bash@3
     displayName: Build