diff --git a/nativeLib/files.native/awipsShare/hydroapps/bin/runso b/nativeLib/files.native/awipsShare/hydroapps/bin/runso index e66c2797f0..6de28be5f8 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/bin/runso and b/nativeLib/files.native/awipsShare/hydroapps/bin/runso differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.4 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.4 index c3b0e7657c..91487350a0 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.4 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.4 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.4 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.4 index 12dd0201fc..aebc08ea7d 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.4 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.4 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so index 4adb1a1bd6..91f0280b0e 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.3 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.3 index 66b44011a5..32af31ec02 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.3 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.3 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so index b08a229ad7..9c30a60daa 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id index 7535e37d87..963d1a07dc 100644 --- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id +++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id @@ -1 +1 @@ -4c20095494167780814ef43d6f33ec9e97553b0d \ No newline at end of file +13d3adc76aa4f26aaa92e3f6c4e08ead383187cd \ No newline at end of file diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id index 6450df0293..98325fa299 100644 --- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id +++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id @@ -1 +1 @@ -795a7729d7494670d3d763a4e09742f035b756e4 \ No newline at end of file +28b867bc379197e7de408eccc9d9e1d0d53bf299 \ No newline at end of file diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so index 763d222887..f0f20aaebf 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so index ef4b598eaa..99d007e6c9 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so differ diff --git a/nativeLib/files.native/edex/bin/runso b/nativeLib/files.native/edex/bin/runso index e66c2797f0..6de28be5f8 100755 Binary files a/nativeLib/files.native/edex/bin/runso and b/nativeLib/files.native/edex/bin/runso differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.4 b/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.4 index c3b0e7657c..91487350a0 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.4 and b/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.4 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.4 b/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.4 index 12dd0201fc..aebc08ea7d 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.4 and b/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.4 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libjvm.so b/nativeLib/files.native/edex/lib/native/linux32/libjvm.so index 4adb1a1bd6..91f0280b0e 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libjvm.so and b/nativeLib/files.native/edex/lib/native/linux32/libjvm.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.3 b/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.3 index 66b44011a5..32af31ec02 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.3 and b/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.3 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libpq.so.5.5 b/nativeLib/files.native/edex/lib/native/linux32/libpq.so.5.5 index 1bedcb5216..20bef38910 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libpq.so.5.5 and b/nativeLib/files.native/edex/lib/native/linux32/libpq.so.5.5 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libpqwalreceiver.so b/nativeLib/files.native/edex/lib/native/linux32/libpqwalreceiver.so index d688cbe1e0..99439d1eb7 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libpqwalreceiver.so and b/nativeLib/files.native/edex/lib/native/linux32/libpqwalreceiver.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so b/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so index b08a229ad7..9c30a60daa 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so and b/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ffg.so b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ffg.so index cadede26a2..924d2ca5eb 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ffg.so and b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ffg.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id index 7535e37d87..963d1a07dc 100644 --- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id +++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id @@ -1 +1 @@ -4c20095494167780814ef43d6f33ec9e97553b0d \ No newline at end of file +13d3adc76aa4f26aaa92e3f6c4e08ead383187cd \ No newline at end of file diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id index 6450df0293..98325fa299 100644 --- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id +++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id @@ -1 +1 @@ -795a7729d7494670d3d763a4e09742f035b756e4 \ No newline at end of file +28b867bc379197e7de408eccc9d9e1d0d53bf299 \ No newline at end of file diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so index 763d222887..f0f20aaebf 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so and b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so index ef4b598eaa..99d007e6c9 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so and b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so differ diff --git a/nativeLib/rary.cots.java/.cproject b/nativeLib/rary.cots.java/.cproject index d1cabbba31..dd96d1d5a2 100644 --- a/nativeLib/rary.cots.java/.cproject +++ b/nativeLib/rary.cots.java/.cproject @@ -1,213 +1,217 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.cots.java/.settings/org.eclipse.cdt.core.prefs b/nativeLib/rary.cots.java/.settings/org.eclipse.cdt.core.prefs index 75af6846ba..76099fdffb 100644 --- a/nativeLib/rary.cots.java/.settings/org.eclipse.cdt.core.prefs +++ b/nativeLib/rary.cots.java/.settings/org.eclipse.cdt.core.prefs @@ -1,3 +1,13 @@ -#Sun Mar 07 15:58:22 CST 2010 eclipse.preferences.version=1 -environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495=\n\n\n\n\n\n +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495= +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/BUILD_DIR/delimiter=; +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/BUILD_DIR/operation=append +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/BUILD_DIR/value=../build.native/i386-pc-linux-gnu +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_FROM/delimiter=; +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_FROM/operation=replace +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_FROM/value=jdk1.6.0_12 +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_TO/delimiter=; +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_TO/operation=replace +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/INSTALL_TO/value=../build.native/i386-pc-linux-gnu/usr/java +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/append=true +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1295629495/appendContributed=true diff --git a/nativeLib/rary.cots.java/README.txt b/nativeLib/rary.cots.java/README.txt new file mode 100644 index 0000000000..ab2cca06fd --- /dev/null +++ b/nativeLib/rary.cots.java/README.txt @@ -0,0 +1,3 @@ +The JAVA libjvm.so library that is distributed with the inherited A1 hydro and +mpe code will always be a 32-bit version of the same Java that is distributed +with AWIPS II. This 32-bit JAVA is only used for nativeLib. \ No newline at end of file diff --git a/nativeLib/rary.cots.java/jdk-6u12-linux-i586.bin.REMOVED.git-id b/nativeLib/rary.cots.java/jdk-6u12-linux-i586.bin.REMOVED.git-id deleted file mode 100644 index 6944c27ba2..0000000000 --- a/nativeLib/rary.cots.java/jdk-6u12-linux-i586.bin.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0fa80c19e6e18731d7ce65a0fca678dd26b19c54 \ No newline at end of file diff --git a/nativeLib/rary.cots.java/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id b/nativeLib/rary.cots.java/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id new file mode 100644 index 0000000000..fee9fa7877 --- /dev/null +++ b/nativeLib/rary.cots.java/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +bf93be5f585df5cc8d0494346c7fb009ddca3ae7 \ No newline at end of file diff --git a/nativeLib/rary.cots.java/makefile b/nativeLib/rary.cots.java/makefile index 2c889cf263..c73ac5a097 100644 --- a/nativeLib/rary.cots.java/makefile +++ b/nativeLib/rary.cots.java/makefile @@ -1,19 +1,12 @@ all: $(INSTALL_FROM) - # put the jvm library into the root /lib directory so its picked up without setting LD_PRELOAD_PATH. - cp $(INSTALL_FROM)/jre/lib/i386/client/libjvm.so $(BUILD_DIR)/lib - $(MAKE) -f ../build.native/makefile.copy all - -$(INSTALL_FROM): - chmod +x *.bin - find . -name "*.bin" -exec bash -c 'echo yes | ./{}' \; + /bin/tar -xf jdk-7u55-linux-i586.tar.gz jdk1.7.0_55/jre/lib/i386/client/libjvm.so + cp jdk1.7.0_55/jre/lib/i386/client/libjvm.so $(BUILD_DIR)/lib clean: - rm -rf jdk1.6.0_12 + rm -rf jdk1.7.0_55 rm -rf uninstall~ rm -f $(BUILD_DIR)/lib/libjvm.so - chmod -R +w $(INSTALL_TO) - $(MAKE) -f ../build.native/makefile.copy clean %: $(MAKE) -f ../build.native/makefile.copy $@ \ No newline at end of file