Skip to content

Commit 89d35ca

Browse files
codeanticodecodeanticode
committed
updated ant/gradle build scripts
1 parent 92c5fc8 commit 89d35ca

File tree

5 files changed

+33
-112
lines changed

5 files changed

+33
-112
lines changed

‎build.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1+
apply plugin: 'java'
2+
13
buildscript {
24
repositories {
3-
//mavenCentral()
45
jcenter()
56
}
6-
77
dependencies {
88
classpath group: 'commons-io', name: 'commons-io', version: '2.5'
99
classpath group: 'org.zeroturnaround', name: 'zt-zip', version: '1.9'
1010
}
1111
}
1212

13-
apply plugin: 'java'
14-
1513
allprojects {
1614
apply plugin: 'java'
17-
// Find location of android jar relative to ANDROID_HOME
15+
1816
ext.android_platform = "$sdkdir/platforms/android-$sdkver"
17+
ext.core_jar_path = "$rootDir/android-core.zip"
1918

2019
repositories {
2120
jcenter()
22-
//mavenCentral()
23-
flatDir { dirs 'core/library', android_platform}
21+
flatDir dirs: "$rootDir/core/library"
22+
flatDir dirs: "$rootDir/core/build/libs"
23+
flatDir dirs: "$rootDir/libraries/cardboard/lib"
24+
flatDir dirs: android_platform
2425
}
2526

2627
sourceCompatibility = 1.7
@@ -70,10 +71,23 @@ task dist {
7071

7172
Files.copy(file("mode.properties").toPath(),
7273
file("$root/mode.properties").toPath(), REPLACE_EXISTING);
74+
75+
FileUtils.copyDirectory(file("libraries/cardboard/examples"),
76+
file("$root/libraries/cardboard/examples"))
77+
FileUtils.copyDirectory(file("libraries/cardboard/gvrsdk"),
78+
file("$root/libraries/cardboard/gvrsdk"))
79+
FileUtils.copyDirectory(file("libraries/cardboard/lib"),
80+
file("$root/libraries/cardboard/lib"))
81+
FileUtils.copyDirectory(file("libraries/cardboard/library"),
82+
file("$root/libraries/cardboard/library"))
83+
FileUtils.copyDirectory(file("libraries/cardboard/src"),
84+
file("$root/libraries/cardboard/src"))
85+
Files.copy(file("libraries/cardboard/library.properties").toPath(),
86+
file("$root/libraries/cardboard/library.properties").toPath(), REPLACE_EXISTING);
7387

7488
ZipUtil.pack(file("$buildDir/zip"), new File("release/AndroidMode.zip"))
7589
Files.copy(file("mode.properties").toPath(),
76-
file("release/AndroidMode.txt").toPath(), REPLACE_EXISTING);
90+
file("release/AndroidMode.txt").toPath(), REPLACE_EXISTING);
7791
} catch (Exception ex) {
7892
logger.error ex.getMessage()
7993
}

‎build.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,12 @@
9090
<include name="examples/**" />
9191
<include name="icons/**" />
9292
<include name="theme/**" />
93-
<include name="libraries/**" />
93+
<include name="libraries/cardboard/library.properties" />
94+
<include name="libraries/cardboard/examples/**" />
95+
<include name="libraries/cardboard/gvrsdk/**" />
96+
<include name="libraries/cardboard/lib/**" />
97+
<include name="libraries/cardboard/library/**" />
98+
<include name="libraries/cardboard/src/**" />
9499
<exclude name="**/._*" />
95100
</zipfileset>
96101
</zip>

‎core/build.gradle

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
apply plugin: 'java'
2-
31
buildscript {
42
repositories {
5-
// mavenCentral()
63
jcenter()
74
}
85
dependencies {
@@ -11,21 +8,6 @@ buildscript {
118
}
129
}
1310

14-
// Find location of android jar relative to ANDROID_HOME
15-
def android_platform = "$sdkdir/platforms/android-$sdkver"
16-
def core_jar_path = "../android-core.zip"
17-
18-
// Check to see if required API exists
19-
// TODO: Look for any higher SDK and use it.
20-
if (!file(android_platform).exists()) {
21-
logger.error "Android SDK $sdkver could not be found in $sdkdir"
22-
}
23-
24-
repositories {
25-
//jcenter()
26-
flatDir {dirs 'library', android_platform}
27-
}
28-
2911
dependencies {
3012
compile name: 'android'
3113
compile name: 'android-support-v4'
@@ -43,7 +25,6 @@ sourceSets {
4325
}
4426
}
4527

46-
// Create Jar
4728
jar {
4829
manifest {
4930
attributes(
@@ -67,6 +48,7 @@ task dist {
6748
Files.copy(file("$buildDir/libs/core.jar").toPath(),
6849
file("$buildDir/libs/android-core.zip").toPath(), REPLACE_EXISTING);
6950

51+
// and copy it to root
7052
Files.copy(file("$buildDir/libs/core.jar").toPath(),
7153
file("$core_jar_path").toPath(), REPLACE_EXISTING);
7254
}

‎libraries/cardboard/build.gradle

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
apply plugin: 'java'
2-
31
buildscript {
42
repositories {
5-
// mavenCentral()
63
jcenter()
74
}
85
dependencies {
@@ -11,21 +8,6 @@ buildscript {
118
}
129
}
1310

14-
// Find location of android jar relative to ANDROID_HOME
15-
def android_platform = "$sdkdir/platforms/android-$sdkver"
16-
def core_libs_path = "../../core/build/libs"
17-
18-
// Check to see if required API exists
19-
// TODO: Look for any higher SDK and use it.
20-
if (!file(android_platform).exists()) {
21-
logger.error "Android SDK $sdkver could not be found in $sdkdir"
22-
}
23-
24-
repositories {
25-
//jcenter()
26-
flatDir {dirs 'lib', core_libs_path, android_platform}
27-
}
28-
2911
dependencies {
3012
compile name: 'android'
3113
compile name: 'core'
@@ -45,7 +27,6 @@ sourceSets {
4527
}
4628
}
4729

48-
// Create Jar
4930
jar {
5031
manifest {
5132
attributes(
@@ -56,7 +37,7 @@ jar {
5637
}
5738

5839
clean.doFirst {
59-
// delete "$core_jar_path"
40+
delete "library/cardboard.jar"
6041
}
6142

6243
import groovy.util.AntBuilder
@@ -65,12 +46,9 @@ import static java.nio.file.StandardCopyOption.*;
6546

6647
task dist {
6748
doLast {
68-
// make copy of jar file as zip
69-
// Files.copy(file("$buildDir/libs/core.jar").toPath(),
70-
// file("$buildDir/libs/android-core.zip").toPath(), REPLACE_EXISTING);
71-
72-
// Files.copy(file("$buildDir/libs/core.jar").toPath(),
73-
// file("$core_jar_path").toPath(), REPLACE_EXISTING);
49+
// make copy of jar file to library folder
50+
Files.copy(file("$buildDir/libs/cardboard.jar").toPath(),
51+
file("library/cardboard.jar").toPath(), REPLACE_EXISTING);
7452
}
7553
}
7654

‎libraries/cardboard/build.xml

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -40,62 +40,4 @@
4040
../../../processing/java/mode/jdtCompilerAdapter.jar" />
4141
</javac>
4242
</target>
43-
44-
<target name="dist" depends="build" description="Creates distribution package">
45-
<mkdir dir="dist/tmp/cardboard" />
46-
47-
<!-- copy library files (jar and natives) -->
48-
<copy todir="dist/tmp/cardboard/library">
49-
<fileset dir="library" />
50-
</copy>
51-
52-
<!-- copy examples -->
53-
<copy todir="dist/tmp/cardboard/examples">
54-
<fileset dir="examples" />
55-
</copy>
56-
57-
<!-- copy source -->
58-
<copy todir="dist/tmp/cardboard/src">
59-
<fileset dir="src" />
60-
</copy>
61-
62-
<!-- copy GVR SDK (needed by the mode to build the carboard app) -->
63-
<copy todir="dist/tmp/cardboard/gvrsdk">
64-
<fileset dir="gvrsdk" />
65-
</copy>
66-
67-
<!-- copy properties -->
68-
<copy file="library.properties" tofile="dist/tmp/cardboard/library.properties" />
69-
70-
<!-- create the java reference of the library -->
71-
<!--
72-
<mkdir dir="dist/tmp/video_android/reference" />
73-
<javadoc bottom="Processing video library by The Processing Foundation. (c) 2011-14"
74-
classpath="../processing/core/library/core.jar;bin"
75-
destdir="dist/tmp/video_android/reference"
76-
verbose="false"
77-
stylesheetfile="resources/stylesheet.css"
78-
doctitle="Javadocs: Video library for Android"
79-
public="true" version="false"
80-
windowtitle="Javadocs: Video library for Android">
81-
<link href="http://java.sun.com/javase/6/docs/api/" />
82-
<link href="http://github.com/omerjerk" />
83-
<taglet name="ExampleTaglet" path="resources/code" />
84-
<fileset dir="dist/tmp/video/src" defaultexcludes="yes">
85-
<include name="**/*"/>
86-
</fileset>
87-
</javadoc> -->
88-
89-
<!-- create zip package -->
90-
<delete file="dist/cardboard.zip"/>
91-
<zip destfile="dist/cardboard.zip"
92-
basedir="dist/tmp"
93-
excludes="**/.DS_Store"
94-
/>
95-
96-
<!-- copy properties to use by download manager -->
97-
<copy file="library.properties" tofile="dist/cardboard.txt" />
98-
99-
<delete dir="dist/tmp" />
100-
</target>
10143
</project>

0 commit comments

Comments
 (0)