diff --git a/Source/Package/Assets/artoolkitX-Unity/Plugins/x86_64/ARX.dll.meta b/Source/Package/Assets/artoolkitX-Unity/Plugins/x86_64/ARX.dll.meta index f6355f7..a2e1d11 100644 --- a/Source/Package/Assets/artoolkitX-Unity/Plugins/x86_64/ARX.dll.meta +++ b/Source/Package/Assets/artoolkitX-Unity/Plugins/x86_64/ARX.dll.meta @@ -32,7 +32,7 @@ PluginImporter: - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Source/Package/Assets/artoolkitX-Unity/Scripts/Editor/ARToolKitPackager.cs b/Source/Package/Assets/artoolkitX-Unity/Scripts/Editor/ARToolKitPackager.cs index e6f5b8f..20afcf9 100644 --- a/Source/Package/Assets/artoolkitX-Unity/Scripts/Editor/ARToolKitPackager.cs +++ b/Source/Package/Assets/artoolkitX-Unity/Scripts/Editor/ARToolKitPackager.cs @@ -148,7 +148,9 @@ public static void CreatePackage() { #endif // UNITY_ANDROID string[] assets = { - "Assets", + "Assets/artoolkitX-Unity", + "Assets/Patterns", + "Assets/StreamingAssets", }; AssetDatabase.ExportPackage(assets, packageName, ExportPackageOptions.Recurse); diff --git a/Source/packaging/package.sh b/Source/packaging/package.sh index 9157d30..59ffa9e 100755 --- a/Source/packaging/package.sh +++ b/Source/packaging/package.sh @@ -31,15 +31,34 @@ # -e = exit on errors set -e -x -#One can pass the unity version as parameter is no version is passed the script will only look for an app called 'Unity' -UNITY_VERSION=$1 - # Get our location. OURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ARUNITYX_HOME="$OURDIR/../.." PROJECT_PATH="${ARUNITYX_HOME}/Source/Package" PLUGINS_BASE="${PROJECT_PATH}/Assets/artoolkitX-Unity/Plugins" +# Parse parameters +while test $# -gt 0 +do + case "$1" in + --with-gpu) UNITY_WITH_GPU= + ;; + --log) touch "$2" && LOG="-logFile $2"; shift + ;; + --debug) DEBUG= + ;; + --dev) DEV=1 + ;; + --*) echo "bad option $1" + usage + ;; + *) echo "bad argument $1" + usage + ;; + esac + shift +done + OS=$(uname -s) WINPATH=cygpath if [ "$OS" = "Linux" ] @@ -113,7 +132,8 @@ sed -Ei "" "s/artoolkitX for Unity Version (([0-9]+\.[0-9]+)(\.[0-9]+)?(r[0-9]+) -stackTraceLogType Full \ -projectPath "${UNITY_PROJECT_PATH}" \ -arunityxpackagename arunityX-${VERSION}.unitypackage \ - -executeMethod ARToolKitPackager.CreatePackage + -executeMethod ARToolKitPackager.CreatePackage \ + ${LOG} \ # Move the output. mv "${PROJECT_PATH}/arunityX-${VERSION}.unitypackage" "${ARUNITYX_HOME}"