xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1

Browse source 
Former-commit-id: 141e06c56b [formerly 867116ab36] [formerly 1822a27f2b] [formerly 141e06c56b [formerly 867116ab36] [formerly 1822a27f2b] [formerly 5e81d6dbb3 [formerly 1822a27f2b [formerly a339ce4bcab3e2edd969e33549599783c3e4416e]]]]
Former-commit-id: 5e81d6dbb3
Former-commit-id: 1f4b83b909 [formerly 3675204b31] [formerly 3278f75ca1453f5cdccc5f8f3aa2e9e417bc6b2f [formerly f42c877933]]
Former-commit-id: 11de2826cb3cc29896d901a743f03bac876a6fa4 [formerly 6ab4f39604]
Former-commit-id: cdf6bb7b9f
This commit is contained in:
Lee Venable 2014-05-22 09:57:56 -05:00 • committed by Gerrit Code Review
commit 5608238369
49 changed files with 499 additions and 482 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nativeLib/build.native/makefile.cots
View file

@ -4,7 +4,7 @@
.SILENT:
tar_files = $(wildcard *.tar.bz2)
tar_files = $(wildcard *.tar.bz2 *.tar.gz)
target_dir = $(realpath .)/$(INSTALL_TO)

6
nativeLib/dist.native/arrange_files.sh
View file

@ -29,8 +29,8 @@ cprm $tmp_location/hydroapps $hydro_base_dir
mkdir -p $hydro_base_dir/bin
mkdir -p $hydro_base_dir/lib/native/linux32
cp $tmp_location/edex/bin/runso $hydro_base_dir/bin 2>/dev/null || true
ohd_util_libraries="libecpg_compat.so.3 libecpg_compat.so.3.0 libecpg.so.6 libecpg.so.6.0 library.ohd.util.so libjasper.so.1 libjvm.so libpgtypes.so.3 libpgtypes.so.3.0 library.ohd.ofs.so library.ohd.pproc.so libgfortran.so.1 library.empty.motif.so library.ohd.whfs.so"
cp $tmp_location/edex/bin/runso $hydro_base_dir/bin
ohd_util_libraries="libecpg_compat.so.3 libecpg_compat.so.3.4 libecpg.so.6 libecpg.so.6.4 library.ohd.util.so libjasper.so.1 libjasper.so.1.0.0 libjvm.so libpgtypes.so.3 libpgtypes.so.3.3 library.ohd.ofs.so library.ohd.pproc.so libgfortran.so.1 library.empty.motif.so library.ohd.whfs.so"
for lib in $ohd_util_libraries; do
cp $tmp_location/edex/lib/native/linux32/$lib $hydro_base_dir/lib/native/linux32 2>/dev/null || true
cp -P $tmp_location/edex/lib/native/linux32/$lib $hydro_base_dir/lib/native/linux32
done

BIN
nativeLib/files.native/awipsShare/hydroapps/bin/runso Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6
View file

Binary file not shown.

1
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6 Symbolic link
View file

@ -0,0 +1 @@
libecpg.so.6.4

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.4 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3
View file

Binary file not shown.

1
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3 Symbolic link
View file

@ -0,0 +1 @@
libecpg_compat.so.3.4

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.4 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1
View file

Binary file not shown.

1
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1 Symbolic link
View file

@ -0,0 +1 @@
libjasper.so.1.0.0

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1.0.0 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3
View file

Binary file not shown.

1
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3 Symbolic link
View file

@ -0,0 +1 @@
libpgtypes.so.3.3

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.3 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
View file

Binary file not shown.

2
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
View file

@ -1 +1 @@
7d5b051039964b49fc7ac2336857ce70d216028f
4c20095494167780814ef43d6f33ec9e97553b0d

2
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
80c11668bbfe3803e0c4919198ed9da9a1a39b1b
795a7729d7494670d3d763a4e09742f035b756e4

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/bin/runso Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg.so
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libecpg.so Symbolic link
View file

@ -0,0 +1 @@
libecpg.so.6.4

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6 Symbolic link
View file

@ -0,0 +1 @@
libecpg.so.6.4

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.4 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so Symbolic link
View file

@ -0,0 +1 @@
libecpg_compat.so.3.4

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3 Symbolic link
View file

@ -0,0 +1 @@
libecpg_compat.so.3.4

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.4 Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libjasper.so
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libjasper.so Symbolic link
View file

@ -0,0 +1 @@
libjasper.so.1.0.0

BIN
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1 Symbolic link
View file

@ -0,0 +1 @@
libjasper.so.1.0.0

BIN
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so Symbolic link
View file

@ -0,0 +1 @@
libpgtypes.so.3.3

BIN
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3 Symbolic link
View file

@ -0,0 +1 @@
libpgtypes.so.3.3

BIN
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.3 Executable file
View file

Binary file not shown.

1
nativeLib/files.native/edex/lib/native/linux32/libpq.so Symbolic link
View file

@ -0,0 +1 @@
libpq.so.5.5

1
nativeLib/files.native/edex/lib/native/linux32/libpq.so.5 Symbolic link
View file

@ -0,0 +1 @@
libpq.so.5.5

BIN
nativeLib/files.native/edex/lib/native/linux32/libpq.so.5.5 Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/libpqwalreceiver.so Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/library.ohd.ffg.so Normal file → Executable file
View file

Binary file not shown.

2
nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
View file

@ -1 +1 @@
7d5b051039964b49fc7ac2336857ce70d216028f
4c20095494167780814ef43d6f33ec9e97553b0d

2
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
80c11668bbfe3803e0c4919198ed9da9a1a39b1b
795a7729d7494670d3d763a4e09742f035b756e4

BIN
nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so Normal file → Executable file
View file

Binary file not shown.

BIN
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so Normal file → Executable file
View file

Binary file not shown.

24
nativeLib/rary.cots.postgresql/.cproject
View file

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>
<!-- postgresql project -->
<cproject>
<?fileVersion 4.0.0?><!-- postgresql project --><cproject>
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="0.1595910623.1577260234">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1595910623.1577260234" moduleId="org.eclipse.cdt.core.settings" name="i386-pc-linux-gnu.release">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@ -49,6 +47,16 @@
</target>
</buildTargets>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="rary.cots.postgresql.null.1571730929" name="rary.cots.postgresql"/>
</storageModule>
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/rary.cots.postgresql"/>
<resource resourceType="PROJECT" workspacePath="/build.native"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@ -464,10 +472,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="rary.cots.postgresql.null.1571730929" name="rary.cots.postgresql"/>
</storageModule>
</cproject>

17
nativeLib/rary.cots.postgresql/.settings/org.eclipse.cdt.core.prefs
View file

@ -1,4 +1,17 @@
#Sun Mar 07 14:50:44 CST 2010
eclipse.preferences.version=1
environment/project/0.1595910623=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<environment append\="true" appendContributed\="true">\n<variable delimiter\=";" name\="PATH" operation\="append" value\=""/>\n<variable delimiter\=";" name\="INSTALL_TO" operation\="append" value\="${ConfigName}"/>\n</environment>\n
environment/project/0.1595910623.1577260234=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<environment append\="true" appendContributed\="false">\n<variable delimiter\=";" name\="CC" operation\="replace" value\="gcc -m32 -Wl,--hash-style\=sysv"/>\n<variable delimiter\=";" name\="PATH" operation\="replace" value\="../../build.native/i386-pc-linux-gnu/bin\:${env_var\:PATH}"/>\n<variable delimiter\=";" name\="LD" operation\="replace" value\="ld -melf_i386 --hash-style\=sysv"/>\n<variable delimiter\=";" name\="INSTALL_TO" operation\="replace" value\="../build.native/i386-pc-linux-gnu"/>\n</environment>\n
environment/project/0.1595910623.1577260234=
environment/project/0.1595910623.1577260234/CC/delimiter=;
environment/project/0.1595910623.1577260234/CC/operation=replace
environment/project/0.1595910623.1577260234/CC/value=gcc -m32 -Wl,--hash-style\=sysv
environment/project/0.1595910623.1577260234/INSTALL_TO/delimiter=;
environment/project/0.1595910623.1577260234/INSTALL_TO/operation=replace
environment/project/0.1595910623.1577260234/INSTALL_TO/value=../build.native/i386-pc-linux-gnu
environment/project/0.1595910623.1577260234/LD/delimiter=;
environment/project/0.1595910623.1577260234/LD/operation=replace
environment/project/0.1595910623.1577260234/LD/value=ld -melf_i386 --hash-style\=sysv
environment/project/0.1595910623.1577260234/PATH/delimiter=;
environment/project/0.1595910623.1577260234/PATH/operation=replace
environment/project/0.1595910623.1577260234/PATH/value=../../build.native/i386-pc-linux-gnu/bin\:${env_var\:PATH}
environment/project/0.1595910623.1577260234/append=true
environment/project/0.1595910623.1577260234/appendContributed=false

2
nativeLib/rary.cots.postgresql/makefile
View file

@ -1,5 +1,5 @@
configure_options=--without-readline
configure_options=--without-readline --disable-integer-datetimes
-include ../build.native/makefile.cots

BIN
nativeLib/rary.cots.postgresql/postgresql-8.3.6.tar.bz2 → nativeLib/rary.cots.postgresql/postgresql-9.2.4.tar.gz
View file

Binary file not shown.