Browse Source

修复display-client的classpath——依赖common工程

yangbiao 9 years ago
parent
commit
f2f7051a9b
4 changed files with 12 additions and 44 deletions
  1. 6 6
      display-client/.classpath
  2. 2 2
      display-client/lint.xml
  3. 2 35
      display-client/project.properties
  4. 2 1
      ipu-server/.gitignore

+ 6 - 6
display-client/.classpath

@ -1,6 +1,6 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
4
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
5
	<classpathentry kind="output" path="bin"/>
6
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="src" path="gen"/>
4
	<classpathentry kind="src" path="src"/>
5
	<classpathentry kind="output" path="bin/classes"/>
6
</classpath>

+ 2 - 2
display-client/lint.xml

@ -1,3 +1,3 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<lint>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<lint>
3 3
</lint>

+ 2 - 35
display-client/project.properties

@ -1,37 +1,4 @@
1
<<<<<<< HEAD
2
# This file is automatically generated by Android Tools.
3
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
4
#
5
# This file must be checked in Version Control Systems.
6
#
7
# To customize properties used by the Ant build system edit
8
# "ant.properties", and override values to adapt the script to your
9
# project structure.
10
#
11
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
12
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
13

14
android.library.reference.1=../wade-mobile-lib
15
android.library.reference.2=../wade-mobile-common
16
proguard.config=proguard-project.txt
17
# Project target.
18
target=android-15
19
=======
20
# This file is automatically generated by Android Tools.
21
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
22
#
23
# This file must be checked in Version Control Systems.
24
#
25
# To customize properties used by the Ant build system edit
26
# "ant.properties", and override values to adapt the script to your
27
# project structure.
28
#
29
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
30
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
31
32
android.library.reference.1=../wade-mobile-lib
33
android.library.reference.2=../wade-mobile-common
34
proguard.config=proguard-project.txt
35 1
# Project target.
36 2
target=android-15
37
>>>>>>> branch 'master' of http://114.215.100.48:3000/ipu/android-share.git
3
android.library.reference.1=../wade-mobile-lib
4
android.library.reference.2=../wade-mobile-common

+ 2 - 1
ipu-server/.gitignore

@ -4,4 +4,5 @@
4 4
/web/res.version.properties
5 5
/.DS_Store
6 6
/web/.DS_Store
7
/web/WEB-INF/.DS_Store
7
/web/WEB-INF/.DS_Store
8
/bin/