From 073e43a5a4b84da78b5ae211faf4025181bf08a3 Mon Sep 17 00:00:00 2001 From: mittorn Date: Sun, 20 Dec 2015 17:39:19 +0600 Subject: [PATCH] Skip .git in pak --- build-test.sh | 1 + makepak.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-test.sh b/build-test.sh index 89bf783a..d3a1d95c 100644 --- a/build-test.sh +++ b/build-test.sh @@ -5,6 +5,7 @@ APKBUILDER=./../apkbuilder mkdir gen mkdir bin sh gen-version.sh test build +rm assets/extras.pak python2.7 makepak.py xash-extras assets/extras.pak $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR $JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/* diff --git a/makepak.py b/makepak.py index e2cbd429..02c74234 100644 --- a/makepak.py +++ b/makepak.py @@ -21,8 +21,10 @@ fileentries = [] for root, subFolders, files in os.walk(rootdir): for file in files: entry = FileEntry() - impfilename = os.path.join(root,file) - entry.filename = os.path.relpath(impfilename,rootdir).replace("\\","/") + impfilename = os.path.join(root,file) + entry.filename = os.path.relpath(impfilename,rootdir).replace("\\","/") + if(entry.filename.startswith(".git")):continue + print "pak: "+entry.filename with open(impfilename, "rb") as importfile: pakfile.write(importfile.read()) entry.offset = offset