Skip to content

Commit

Permalink
Modified Android dist target to package as needed for briefcase.
Browse files Browse the repository at this point in the history
  • Loading branch information
freakboy3742 committed Jan 4, 2016
1 parent bc168c6 commit 1d60bc1
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
14 changes: 13 additions & 1 deletion build-android.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,19 @@
</do-only-if-manifest-hasCode>
</target>

<target name="dist" depends="-compile, -post-compile, -obfuscate" />
<target name="dist" depends="-compile, -post-compile, -obfuscate">
<!-- Put the jar file into a /libs directory in the tarball.
We also create a src directory in the tarball to fool the
installer into thinking there isn't a common filename
prefix, so the libs directory will be unrolled. -->

<mkdir dir="${out.absolute.dir}/android/libs"/>
<mkdir dir="${out.absolute.dir}/android/src"/>
<move file="${out.absolute.dir}/${out.jar.name}.jar"
todir="${out.absolute.dir}/android/libs" />
<tar destfile="${out.absolute.dir}/Python-Android-${python-version}-b${release}.tar.gz"
basedir="${out.absolute.dir}/android" />
</target>

<!--
Import per project custom build rules if present at the root of the project.
Expand Down
7 changes: 6 additions & 1 deletion build-java.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<target name="dist" depends="compile" description="Generate Oracle jar file">
<mkdir dir="${dist}"/>

<jar jarfile="${dist}/python-java.jar" basedir="${build}/java"/>
<jar jarfile="${dist}/Python-Java-${python-version}-b${release}.jar" basedir="${build}/java"/>

<symlink
link="${dist}/python-java.jar"
resource="${dist}/Python-Java-${python-version}-b${release}.jar"
overwrite="true" />
</target>

<target name="clean" description="Clean up">
Expand Down
3 changes: 3 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
Build Python support libraries for voc
</description>

<property name="python-version" value="3.4.2"/>
<property name="release" value="1"/>

<property name="build" location="build"/>
<property name="dist" location="dist"/>

Expand Down
1 change: 0 additions & 1 deletion voc/transpiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def transpile(input, prefix='.', outdir=None, namespace='python', verbosity=0):
transpiler.transpile(source_file, prefix)
elif os.path.isdir(source_file):
for root, dirs, files in os.walk(source_file, followlinks=True):
print (root, dirs, files)
for filename in files:
if os.path.splitext(filename)[1] == '.py':
source = os.path.join(root, filename)
Expand Down

0 comments on commit 1d60bc1

Please sign in to comment.