Skip to content

Commit 1aa0825

Browse files
committed
Exclude Editor settings from package. Add some debug logging for packaging.
1 parent 2de22e0 commit 1aa0825

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

Source/Package/Assets/artoolkitX-Unity/Plugins/x86_64/ARX.dll.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Package/Assets/artoolkitX-Unity/Scripts/Editor/ARToolKitPackager.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ public static void CreatePackage() {
148148
#endif // UNITY_ANDROID
149149

150150
string[] assets = {
151-
"Assets",
151+
"Assets/artoolkitX-Unity",
152+
"Assets/Patterns",
153+
"Assets/StreamingAssets",
152154
};
153155

154156
AssetDatabase.ExportPackage(assets, packageName, ExportPackageOptions.Recurse);

Source/packaging/package.sh

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,34 @@
3131
# -e = exit on errors
3232
set -e -x
3333

34-
#One can pass the unity version as parameter is no version is passed the script will only look for an app called 'Unity'
35-
UNITY_VERSION=$1
36-
3734
# Get our location.
3835
OURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3936
ARUNITYX_HOME="$OURDIR/../.."
4037
PROJECT_PATH="${ARUNITYX_HOME}/Source/Package"
4138
PLUGINS_BASE="${PROJECT_PATH}/Assets/artoolkitX-Unity/Plugins"
4239

40+
# Parse parameters
41+
while test $# -gt 0
42+
do
43+
case "$1" in
44+
--with-gpu) UNITY_WITH_GPU=
45+
;;
46+
--log) touch "$2" && LOG="-logFile $2"; shift
47+
;;
48+
--debug) DEBUG=
49+
;;
50+
--dev) DEV=1
51+
;;
52+
--*) echo "bad option $1"
53+
usage
54+
;;
55+
*) echo "bad argument $1"
56+
usage
57+
;;
58+
esac
59+
shift
60+
done
61+
4362
OS=$(uname -s)
4463
WINPATH=cygpath
4564
if [ "$OS" = "Linux" ]
@@ -113,7 +132,8 @@ sed -Ei "" "s/artoolkitX for Unity Version (([0-9]+\.[0-9]+)(\.[0-9]+)?(r[0-9]+)
113132
-stackTraceLogType Full \
114133
-projectPath "${UNITY_PROJECT_PATH}" \
115134
-arunityxpackagename arunityX-${VERSION}.unitypackage \
116-
-executeMethod ARToolKitPackager.CreatePackage
135+
-executeMethod ARToolKitPackager.CreatePackage \
136+
${LOG} \
117137

118138
# Move the output.
119139
mv "${PROJECT_PATH}/arunityX-${VERSION}.unitypackage" "${ARUNITYX_HOME}"

0 commit comments

Comments
 (0)