Changed reference to appcompat module to be relative, so I can make it work on a...

diff --git a/Open-ILS/src/Android/.gitignore b/Open-ILS/src/Android/.gitignore
new file mode 100644 (file)
index 0000000..0344271
--- /dev/null
+++ b/Open-ILS/src/Android/.gitignore
@@ -0,0 +1,3 @@
+# support is a symlink (mklink /d) to and android support library, e.g.
+# mklink /d support "\tools\android_sdk\extras\android\support"
+support

diff --git a/Open-ILS/src/Android/core/project.properties b/Open-ILS/src/Android/core/project.properties
index b63391f..d6a9d17 100644 (file)
--- a/Open-ILS/src/Android/core/project.properties
+++ b/Open-ILS/src/Android/core/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-19
 android.library=true
-android.library.reference.1=../../../../../../tools/adt-bundle-windows-x86_64-20130917/sdk/extras/android/support/v7/appcompat
+android.library.reference.1=../support/v7/appcompat

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml b/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml
index b2d809d..a8a2632 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml
@@ -3,7 +3,6 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/androwrapee-1.1.0-e1a06f0b15feb57f60fc050388c60c69.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/org.opensrf2_serialized_reg-5dba35be916c7a72e45ee4bb4a6478a8.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/android-support-v4-feb471f0a1a2b5a42f64c700a1551d08.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/zxing_barcode-7de1bcf4a56bfb1068e055d26c0a58d6.jar!/" />
     </CLASSES>
     <JAVADOC />

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml b/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
index 26f91dc..b59422d 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
@@ -4,7 +4,6 @@
       <root url="jar://$PROJECT_DIR$/../core/libs/org.opensrf2_serialized_reg.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/zxing_barcode.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/androwrapee-1.1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../core/libs/android-support-v4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/modules.xml b/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
index 662faa8..f2d76fd 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://E:/tools/adt-bundle-windows-x86_64-20130917/sdk/extras/android/support/v7/appcompat/appcompat.iml" filepath="E:/tools/adt-bundle-windows-x86_64-20130917/sdk/extras/android/support/v7/appcompat/appcompat.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../support/v7/appcompat/appcompat.iml" filepath="$PROJECT_DIR$/../support/v7/appcompat/appcompat.iml" />
       <module fileurl="file://$PROJECT_DIR$/../core/core.iml" filepath="$PROJECT_DIR$/../core/core.iml" />
       <module fileurl="file://$PROJECT_DIR$/cwmars_app.iml" filepath="$PROJECT_DIR$/cwmars_app.iml" />
     </modules>

diff --git a/Open-ILS/src/Android/cwmars_app/project.properties b/Open-ILS/src/Android/cwmars_app/project.properties
index 4022b4b..a6de5e1 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/project.properties
+++ b/Open-ILS/src/Android/cwmars_app/project.properties
@@ -13,4 +13,4 @@
 # Project target.
 target=android-19
 android.library.reference.1=../core
-android.library.reference.2=../../../../../../tools/adt-bundle-windows-x86_64-20130917/sdk/extras/android/support/v7/appcompat
+android.library.reference.2=../support/v7/appcompat

diff --git a/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
index 26f91dc..b502593 100644 (file)
--- a/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
@@ -4,9 +4,8 @@
       <root url="jar://$PROJECT_DIR$/../core/libs/org.opensrf2_serialized_reg.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/zxing_barcode.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/androwrapee-1.1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../core/libs/android-support-v4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
   </library>
-</component>
\ No newline at end of file
+</component>