Skip to content

Commit 3c99aac

Browse files
pandamicropandamicro
committed
Merge pull request #307 from natural-law/v3
Solve the error when building CocosFramework projects for android.
2 parents 1184e12 + 04e3bb8 commit 3c99aac

File tree

7 files changed

+315
-0
lines changed

7 files changed

+315
-0
lines changed

‎plugins/plugin_generate/bin-templates/cpp-template-default/proj.android/.classpath

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5+
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="src" path="gen"/>
7+
<classpathentry exported="true" kind="lib" path="jars/android-async-http-1.4.8.jar"/>
8+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
9+
<classpathentry kind="output" path="bin/classes"/>
10+
</classpath>

‎plugins/plugin_generate/bin-templates/cpp-template-default/proj.android/build.xml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="HelloCpp" default="help">
3+
4+
<!-- The local.properties file is created and updated by the 'android' tool.
5+
It contains the path to the SDK. It should *NOT* be checked into
6+
Version Control Systems. -->
7+
<property file="local.properties" />
8+
9+
<!-- The ant.properties file can be created by you. It is only edited by the
10+
'android' tool to add properties to it.
11+
This is the place to change some Ant specific build properties.
12+
Here are some properties you may want to change/update:
13+
14+
source.dir
15+
The name of the source directory. Default is 'src'.
16+
out.dir
17+
The name of the output directory. Default is 'bin'.
18+
19+
For other overridable properties, look at the beginning of the rules
20+
files in the SDK, at tools/ant/build.xml
21+
22+
Properties related to the SDK location or the project target should
23+
be updated using the 'android' tool with the 'update' action.
24+
25+
This file is an integral part of the build system for your
26+
application and should be checked into Version Control Systems.
27+
28+
-->
29+
<property file="ant.properties" />
30+
31+
<!-- The project.properties file is created and updated by the 'android'
32+
tool, as well as ADT.
33+
34+
This contains project specific properties such as project target, and library
35+
dependencies. Lower level build properties are stored in ant.properties
36+
(or in .classpath for Eclipse projects).
37+
38+
This file is an integral part of the build system for your
39+
application and should be checked into Version Control Systems. -->
40+
<loadproperties srcFile="project.properties" />
41+
42+
<!-- quick check on sdk.dir -->
43+
<fail
44+
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
45+
unless="sdk.dir"
46+
/>
47+
48+
<!--
49+
Import per project custom build rules if present at the root of the project.
50+
This is the place to put custom intermediary targets such as:
51+
-pre-build
52+
-pre-compile
53+
-post-compile (This is typically used for code obfuscation.
54+
Compiled code location: ${out.classes.absolute.dir}
55+
If this is not done in place, override ${out.dex.input.absolute.dir})
56+
-post-package
57+
-post-build
58+
-pre-clean
59+
-->
60+
<import file="custom_rules.xml" optional="true" />
61+
62+
<!-- Import the actual build file.
63+
64+
To customize existing targets, there are two options:
65+
- Customize only one target:
66+
- copy/paste the target into this file, *before* the
67+
<import> task.
68+
- customize it to your needs.
69+
- Customize the whole content of build.xml
70+
- copy/paste the content of the rules files (minus the top node)
71+
into this file, replacing the <import> task.
72+
- customize to your needs.
73+
74+
***********************
75+
****** IMPORTANT ******
76+
***********************
77+
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
78+
in order to avoid having your file be overridden by tools such as "android update project"
79+
-->
80+
<!-- version-tag: 1 -->
81+
<import file="${sdk.dir}/tools/ant/build.xml" />
82+
83+
<target name="-pre-compile">
84+
<!-- Redefine project.all.jars.path before -compile executes -->
85+
<path id="project.all.jars.path">
86+
<fileset file="./jars/*.jar" />
87+
<fileset file="${sdk.dir}/tools/support/*.jar" />
88+
</path>
89+
</target>
90+
91+
</project>

‎plugins/plugin_generate/bin-templates/js-template-runtime/frameworks/runtime-src/proj.android/.classpath

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5+
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="src" path="gen"/>
7+
<classpathentry exported="true" kind="lib" path="jars/android-async-http-1.4.8.jar"/>
8+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
9+
<classpathentry kind="output" path="bin/classes"/>
10+
</classpath>

‎plugins/plugin_generate/bin-templates/js-template-runtime/frameworks/runtime-src/proj.android/build.xml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="HelloJavascript" default="help">
3+
4+
<!-- The local.properties file is created and updated by the 'android' tool.
5+
It contains the path to the SDK. It should *NOT* be checked into
6+
Version Control Systems. -->
7+
<property file="local.properties" />
8+
9+
<!-- The ant.properties file can be created by you. It is only edited by the
10+
'android' tool to add properties to it.
11+
This is the place to change some Ant specific build properties.
12+
Here are some properties you may want to change/update:
13+
14+
source.dir
15+
The name of the source directory. Default is 'src'.
16+
out.dir
17+
The name of the output directory. Default is 'bin'.
18+
19+
For other overridable properties, look at the beginning of the rules
20+
files in the SDK, at tools/ant/build.xml
21+
22+
Properties related to the SDK location or the project target should
23+
be updated using the 'android' tool with the 'update' action.
24+
25+
This file is an integral part of the build system for your
26+
application and should be checked into Version Control Systems.
27+
28+
-->
29+
<property file="ant.properties" />
30+
31+
<!-- The project.properties file is created and updated by the 'android'
32+
tool, as well as ADT.
33+
34+
This contains project specific properties such as project target, and library
35+
dependencies. Lower level build properties are stored in ant.properties
36+
(or in .classpath for Eclipse projects).
37+
38+
This file is an integral part of the build system for your
39+
application and should be checked into Version Control Systems. -->
40+
<loadproperties srcFile="project.properties" />
41+
42+
<!-- quick check on sdk.dir -->
43+
<fail
44+
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
45+
unless="sdk.dir"
46+
/>
47+
48+
<!--
49+
Import per project custom build rules if present at the root of the project.
50+
This is the place to put custom intermediary targets such as:
51+
-pre-build
52+
-pre-compile
53+
-post-compile (This is typically used for code obfuscation.
54+
Compiled code location: ${out.classes.absolute.dir}
55+
If this is not done in place, override ${out.dex.input.absolute.dir})
56+
-post-package
57+
-post-build
58+
-pre-clean
59+
-->
60+
<import file="custom_rules.xml" optional="true" />
61+
62+
<!-- Import the actual build file.
63+
64+
To customize existing targets, there are two options:
65+
- Customize only one target:
66+
- copy/paste the target into this file, *before* the
67+
<import> task.
68+
- customize it to your needs.
69+
- Customize the whole content of build.xml
70+
- copy/paste the content of the rules files (minus the top node)
71+
into this file, replacing the <import> task.
72+
- customize to your needs.
73+
74+
***********************
75+
****** IMPORTANT ******
76+
***********************
77+
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
78+
in order to avoid having your file be overridden by tools such as "android update project"
79+
-->
80+
<!-- version-tag: 1 -->
81+
<import file="${sdk.dir}/tools/ant/build.xml" />
82+
83+
<target name="-pre-compile">
84+
<!-- Redefine project.all.jars.path before -compile executes -->
85+
<path id="project.all.jars.path">
86+
<fileset file="./jars/*.jar" />
87+
<fileset file="${sdk.dir}/tools/support/*.jar" />
88+
</path>
89+
</target>
90+
91+
</project>

‎plugins/plugin_generate/bin-templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5+
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="src" path="gen"/>
7+
<classpathentry exported="true" kind="lib" path="jars/android-async-http-1.4.8.jar"/>
8+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
9+
<classpathentry kind="output" path="bin/classes"/>
10+
</classpath>

‎plugins/plugin_generate/bin-templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="HelloLua" default="help">
3+
4+
<!-- The local.properties file is created and updated by the 'android' tool.
5+
It contains the path to the SDK. It should *NOT* be checked into
6+
Version Control Systems. -->
7+
<property file="local.properties" />
8+
9+
<!-- The ant.properties file can be created by you. It is only edited by the
10+
'android' tool to add properties to it.
11+
This is the place to change some Ant specific build properties.
12+
Here are some properties you may want to change/update:
13+
14+
source.dir
15+
The name of the source directory. Default is 'src'.
16+
out.dir
17+
The name of the output directory. Default is 'bin'.
18+
19+
For other overridable properties, look at the beginning of the rules
20+
files in the SDK, at tools/ant/build.xml
21+
22+
Properties related to the SDK location or the project target should
23+
be updated using the 'android' tool with the 'update' action.
24+
25+
This file is an integral part of the build system for your
26+
application and should be checked into Version Control Systems.
27+
28+
-->
29+
<property file="ant.properties" />
30+
31+
<!-- The project.properties file is created and updated by the 'android'
32+
tool, as well as ADT.
33+
34+
This contains project specific properties such as project target, and library
35+
dependencies. Lower level build properties are stored in ant.properties
36+
(or in .classpath for Eclipse projects).
37+
38+
This file is an integral part of the build system for your
39+
application and should be checked into Version Control Systems. -->
40+
<loadproperties srcFile="project.properties" />
41+
42+
<!-- quick check on sdk.dir -->
43+
<fail
44+
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
45+
unless="sdk.dir"
46+
/>
47+
48+
<!--
49+
Import per project custom build rules if present at the root of the project.
50+
This is the place to put custom intermediary targets such as:
51+
-pre-build
52+
-pre-compile
53+
-post-compile (This is typically used for code obfuscation.
54+
Compiled code location: ${out.classes.absolute.dir}
55+
If this is not done in place, override ${out.dex.input.absolute.dir})
56+
-post-package
57+
-post-build
58+
-pre-clean
59+
-->
60+
<import file="custom_rules.xml" optional="true" />
61+
62+
<!-- Import the actual build file.
63+
64+
To customize existing targets, there are two options:
65+
- Customize only one target:
66+
- copy/paste the target into this file, *before* the
67+
<import> task.
68+
- customize it to your needs.
69+
- Customize the whole content of build.xml
70+
- copy/paste the content of the rules files (minus the top node)
71+
into this file, replacing the <import> task.
72+
- customize to your needs.
73+
74+
***********************
75+
****** IMPORTANT ******
76+
***********************
77+
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
78+
in order to avoid having your file be overridden by tools such as "android update project"
79+
-->
80+
<!-- version-tag: 1 -->
81+
<import file="${sdk.dir}/tools/ant/build.xml" />
82+
83+
<target name="-pre-compile">
84+
<!-- Redefine project.all.jars.path before -compile executes -->
85+
<path id="project.all.jars.path">
86+
<fileset file="./jars/*.jar" />
87+
<fileset file="${sdk.dir}/tools/support/*.jar" />
88+
</path>
89+
</target>
90+
91+
</project>

‎plugins/plugin_generate/configs/gen_templates_config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,18 @@
156156
{
157157
"from": "cocos/platform/android/java/src",
158158
"to": "js-template-binary/frameworks/runtime-src/proj.android/src"
159+
},
160+
{
161+
"from": "cocos/platform/android/java/libs",
162+
"to": "cpp-template-binary/proj.android/jars"
163+
},
164+
{
165+
"from": "cocos/platform/android/java/libs",
166+
"to": "lua-template-binary/frameworks/runtime-src/proj.android/jars"
167+
},
168+
{
169+
"from": "cocos/platform/android/java/libs",
170+
"to": "js-template-binary/frameworks/runtime-src/proj.android/jars"
159171
}
160172
],
161173
"copy_from_bin_templates" : [

0 commit comments

Comments
 (0)