Issue #2021 - native hydro code will now compile successfully
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07 Former-commit-id:cea990cbe3[formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f] Former-commit-id:032e26c7ba
This commit is contained in:
Bryan Kowal
parent
877e78717b
commit
91a494bde0
5 changed files with 889 additions and 889 deletions
|
|
@ -32,6 +32,8 @@ set -o nounset
|
|||
# - Add C_COMPILER arguments
|
||||
# Apr 9, 2009 jelkins - Support lex files
|
||||
# Oct 1, 2009 jelkins - Support configurable file type "plugins"
|
||||
# June 4, 2013 #2021 bkowal - handle the case when there is a space between
|
||||
# the -o directive and the name of the output
|
||||
#
|
||||
#
|
||||
# @author: jelkins
|
||||
|
|
@ -56,6 +58,7 @@ INCLUDE=
|
|||
OUT_FILE=
|
||||
IN_FILE=
|
||||
OPTIONS=
|
||||
_out_next=false
|
||||
|
||||
# --- Determine the includes, options, input file, and output file
|
||||
|
||||
|
|
@ -67,16 +70,24 @@ do
|
|||
;;
|
||||
-o*)
|
||||
OUT_FILE="${section/-o/}"
|
||||
if [ "${OUT_FILE}" = "" ]; then
|
||||
_out_next=true
|
||||
fi
|
||||
;;
|
||||
-*)
|
||||
OPTIONS="$OPTIONS $section"
|
||||
;;
|
||||
*)
|
||||
IN_FILE="$IN_FILE $section"
|
||||
if [ ${_out_next} = true ]; then
|
||||
_out_next=false
|
||||
OUT_FILE="${section}"
|
||||
else
|
||||
IN_FILE="$section"
|
||||
|
||||
# add the IN_FILE_DIRECTORY to the include path
|
||||
IN_FILE_DIRECTORY="`dirname $IN_FILE`"
|
||||
INCLUDE="-I'$IN_FILE_DIRECTORY' $INCLUDE"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
<option id="gnu.c.compiler.so.debug.option.debugging.level.1276811727" name="Debug Level" superClass="gnu.c.compiler.so.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
||||
<option id="gnu.c.compiler.option.include.paths.1096228238" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
|
||||
<listOptionValue builtIn="false" value="../../rary.ohd.util/inc/degrib_inc"/>
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/rary.cots.jasper/jasper-1.900.1/src/libjasper/include}""/>
|
||||
<listOptionValue builtIn="false" value="../../rary.ohd.ofs/inc"/>
|
||||
<listOptionValue builtIn="false" value="../../rary.ohd.util/inc"/>
|
||||
<listOptionValue builtIn="false" value="../../rary.ohd.util/inc/emapfc_inc"/>
|
||||
|
|
@ -117,42 +118,22 @@
|
|||
</tool>
|
||||
</toolChain>
|
||||
</folderInfo>
|
||||
<folderInfo id="cdt.managedbuild.config.gnu.so.debug.417857382.1390008247.i386-pc-linux-gnu.debug" name="/" resourcePath="i386-pc-linux-gnu.debug">
|
||||
<toolChain id="cdt.managedbuild.toolchain.gnu.so.debug.835604769" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.so.debug" unusedChildren="">
|
||||
<targetPlatform id="cdt.managedbuild.target.gnu.platform.so.debug.140099621" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.so.debug"/>
|
||||
<tool id="cdt.managedbuild.tool.gnu.archiver.base.733083835" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.1945072129"/>
|
||||
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug.1917413685" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug.2062004905">
|
||||
<option id="gnu.cpp.compiler.so.debug.option.optimization.level.926381546" name="Optimization Level" superClass="gnu.cpp.compiler.so.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
|
||||
<option id="gnu.cpp.compiler.so.debug.option.debugging.level.469527440" name="Debug Level" superClass="gnu.cpp.compiler.so.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
|
||||
</tool>
|
||||
<tool id="cdt.managedbuild.tool.gnu.c.compiler.so.debug.402014777" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.so.debug.169650291">
|
||||
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.so.debug.option.optimization.level.32515341" name="Optimization Level" superClass="gnu.c.compiler.so.debug.option.optimization.level" valueType="enumerated"/>
|
||||
<option id="gnu.c.compiler.so.debug.option.debugging.level.1199268823" name="Debug Level" superClass="gnu.c.compiler.so.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1791618658" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
||||
</tool>
|
||||
<tool id="cdt.managedbuild.tool.gnu.c.linker.so.debug.93350250" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.so.debug.857221669">
|
||||
<option defaultValue="true" id="gnu.c.link.so.debug.option.shared.989396209" name="Shared (-shared)" superClass="gnu.c.link.so.debug.option.shared" valueType="boolean"/>
|
||||
</tool>
|
||||
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug.1631255887" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.so.debug.406374821">
|
||||
<option defaultValue="true" id="gnu.cpp.link.so.debug.option.shared.6992651" name="Shared (-shared)" superClass="gnu.cpp.link.so.debug.option.shared" valueType="boolean"/>
|
||||
</tool>
|
||||
<tool id="cdt.managedbuild.tool.gnu.assembler.so.debug.398666094" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.so.debug.1683180863">
|
||||
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1208170412" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
||||
</tool>
|
||||
</toolChain>
|
||||
</folderInfo>
|
||||
<sourceEntries>
|
||||
<entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||
<entry excluding="util_stubs/TEXT/hckdat.f|ugzio/TEXT/zutil.c|ugzio/TEXT/trees.c|ugzio/TEXT/infutil.c|ugzio/TEXT/inftrees.c|ugzio/TEXT/inflate.c|ugzio/TEXT/inffast.c|ugzio/TEXT/infcodes.c|ugzio/TEXT/infblock.c|ugzio/TEXT/gzio.c|ugzio/TEXT/deflate.c|ugzio/TEXT/crc32.c|ugzio/TEXT/adler32.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
|
||||
</sourceEntries>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
|
||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||
|
||||
|
||||
</cconfiguration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<project id="util.cdt.managedbuild.target.gnu.so.271169765" name="Shared Library" projectType="cdt.managedbuild.target.gnu.so"/>
|
||||
</storageModule>
|
||||
<storageModule moduleId="refreshScope"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||
<storageModule moduleId="scannerConfiguration">
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
|
||||
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
|
||||
|
|
@ -568,10 +549,4 @@
|
|||
</profile>
|
||||
</scannerConfigBuildInfo>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||
</cconfiguration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<project id="util.cdt.managedbuild.target.gnu.so.271169765" name="Shared Library" projectType="cdt.managedbuild.target.gnu.so"/>
|
||||
</storageModule>
|
||||
</cproject>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
#Sun Mar 07 14:21:06 CST 2010
|
||||
eclipse.preferences.version=1
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<environment append\="true" appendContributed\="false">\n<variable delimiter\=";" name\="HOME" operation\="replace" value\="${env_var\:HOME}"/>\n<variable delimiter\=";" name\="PATH" operation\="replace" value\="../../build.native/i386-pc-linux-gnu.sysv/bin\:${env_var\:PATH}"/>\n<variable delimiter\=";" name\="USER" operation\="replace" value\="${env_var\:USER}"/>\n</environment>\n
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247=
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/delimiter=;
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/operation=replace
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/value=${env_var\:HOME}
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/delimiter=;
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/operation=replace
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/value=../../build.native/i386-pc-linux-gnu.sysv/bin\:${env_var\:PATH}
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/delimiter=;
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/operation=replace
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/value=${env_var\:USER}
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/append=true
|
||||
environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/appendContributed=false
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "g2libc_inc/grib2.h"
|
||||
#include "jasper/jas_image.h"
|
||||
#include <jasper/jasper.h>
|
||||
#define JAS_1_700_2
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@
|
|||
<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.MakeErrorParser" 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">
|
||||
<configuration artifactName="runso" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.2146632439" name="i386-pc-linux-gnu.debug" parent="cdt.managedbuild.config.gnu.exe.debug" postbuildStep="" prebuildStep="">
|
||||
<configuration artifactName="runso" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.2146632439" name="i386-pc-linux-gnu.debug" parent="cdt.managedbuild.config.gnu.exe.debug" postbuildStep="" prebuildStep="mkdir -p ../../build.native/i386-pc-linux-gnu/bin/">
|
||||
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.2146632439." name="/" resourcePath="">
|
||||
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.2145306057" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
|
||||
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.444516487" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
|
||||
|
|
@ -55,6 +56,16 @@
|
|||
</sourceEntries>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||
</cconfiguration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<project id="runso.cdt.managedbuild.target.gnu.exe.612839118" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
|
||||
</storageModule>
|
||||
<storageModule moduleId="refreshScope"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||
<storageModule moduleId="scannerConfiguration">
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
|
||||
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
|
||||
|
|
@ -304,12 +315,4 @@
|
|||
</profile>
|
||||
</scannerConfigBuildInfo>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||
</cconfiguration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<project id="runso.cdt.managedbuild.target.gnu.exe.612839118" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
|
||||
</storageModule>
|
||||
</cproject>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue