Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.

Former-commit-id: 52f27c2400 [formerly ec9551d614] [formerly 8fef600e84] [formerly 8fef600e84 [formerly ab2c53ae0a]] [formerly 3b7c761f99 [formerly 8fef600e84 [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]] Former-commit-id: 3b7c761f99 Former-commit-id: 2d7d71be6ba118bdda680750781b97d0d59f64db [formerly 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc] [formerly 470511d9a3 [formerly 424bbaf0f7]] Former-commit-id: 470511d9a3 Former-commit-id: e07c3c20b5
2012-07-11 12:44:32 -05:00 · 2012-07-11 12:44:32 -05:00 · 0325f2030a
commit 0325f2030a
parent b93af8d2a1
18 changed files with 8 additions and 33 deletions
--- a/cots/javax.media.opengl.linux32/build.properties
+++ b/cots/javax.media.opengl.linux32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libgluegen-rt.so,\
--- a/cots/javax.media.opengl.linux64/build.properties
+++ b/cots/javax.media.opengl.linux64/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libgluegen-rt.so,\
--- a/cots/javax.media.opengl.win32/build.properties
+++ b/cots/javax.media.opengl.win32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               gluegen-rt.dll,\
--- a/cots/ncsa.hdf5.linux32/build.properties
+++ b/cots/ncsa.hdf5.linux32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libjhdf5.so
--- a/cots/ncsa.hdf5.win32/build.properties
+++ b/cots/ncsa.hdf5.win32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               jhdf5.dll
--- a/cots/org.jep.linux32/build.properties
+++ b/cots/org.jep.linux32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libjep.so
--- a/cots/org.jep.linux64/build.properties
+++ b/cots/org.jep.linux64/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libjep.so
--- a/cots/org.jep.win32/build.properties
+++ b/cots/org.jep.win32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               jep.dll
--- a/cots/org.postgres/.classpath
+++ b/cots/org.postgres/.classpath
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="postgresql-8.3-603.jdbc3.jar" sourcepath="org.postgressrc.zip"/>
--- a/cots/org.postgres/build.properties
+++ b/cots/org.postgres/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               postgresql-8.3-603.jdbc3.jar,\
--- a/cots/org.postgres/src/.placeholder
+++ b/cots/org.postgres/src/.placeholder
--- a/edexOsgi/meteolib.jni.linux32/build.properties
+++ b/edexOsgi/meteolib.jni.linux32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libmeteoLib.so
--- a/edexOsgi/meteolib.jni.linux64/build.properties
+++ b/edexOsgi/meteolib.jni.linux64/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libmeteoLib.so
--- a/edexOsgi/meteolib.jni.win32/build.properties
+++ b/edexOsgi/meteolib.jni.win32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               meteoLib.dll
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/build.properties
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libbignsharp.so
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/build.properties
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               libbignsharp.so
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/build.properties
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/build.properties
@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .,\
               bignsharp.dll
--- a/rpms/awips2.edex/deploy.builder/build.sh
+++ b/rpms/awips2.edex/deploy.builder/build.sh
@ -115,8 +115,14 @@ cd ${WORKSPACE}/build.edex
 if [ $? -ne 0 ]; then
   exit 1
 fi
-/awips2/ant/bin/ant -f build.xml
-if [ $? -ne 0 ]; then
+if [ ${LIGHTNING} = true ]; then
+   /awips2/ant/bin/ant -f build.xml -Dlightning=true
+   RC=$?
+else
+   /awips2/ant/bin/ant -f build.xml
+   RC=$?
+fi
+if [ ${RC} -ne 0 ]; then
   exit 1
 fi
 popd