diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/java/.cproject | 88 | ||||
| -rw-r--r-- | src/runtime/java/.project | 72 | ||||
| -rw-r--r-- | src/runtime/java/Makefile | 31 | ||||
| -rw-r--r-- | src/runtime/java/jpgf.c | 2 |
4 files changed, 161 insertions, 32 deletions
diff --git a/src/runtime/java/.cproject b/src/runtime/java/.cproject new file mode 100644 index 000000000..7e9ea9913 --- /dev/null +++ b/src/runtime/java/.cproject @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?fileVersion 4.0.0?> + +<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> + <storageModule moduleId="org.eclipse.cdt.core.settings"> + <cconfiguration id="cdt.managedbuild.config.gnu.so.debug.400252551"> + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.so.debug.400252551" moduleId="org.eclipse.cdt.core.settings" name="Release"> + <externalSettings> + <externalSetting> + <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/jpgf"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/jpgf/Debug"/> + <entry flags="RESOLVED" kind="libraryFile" name="jpgf"/> + </externalSetting> + </externalSettings> + <extensions> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <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"/> + <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"/> + </extensions> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <configuration artifactExtension="so" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" 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.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.so.debug.400252551" name="Release" parent="cdt.managedbuild.config.gnu.so.debug"> + <folderInfo id="cdt.managedbuild.config.gnu.so.debug.400252551." name="/" resourcePath=""> + <toolChain id="cdt.managedbuild.toolchain.gnu.so.debug.1905300886" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.so.debug"> + <targetPlatform id="cdt.managedbuild.target.gnu.platform.so.debug.132269439" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.so.debug"/> + <builder buildPath="${workspace_loc:/jpgf/Debug}" id="cdt.managedbuild.target.gnu.builder.so.debug.615272281" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.so.debug"/> + <tool id="cdt.managedbuild.tool.gnu.archiver.base.1325033150" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> + <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug.1459920520" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"> + <option id="gnu.cpp.compiler.so.debug.option.optimization.level.475858942" 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.1323080663" name="Debug Level" superClass="gnu.cpp.compiler.so.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> + <option id="gnu.cpp.compiler.option.other.other.560771143" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/> + <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.59690088" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> + </tool> + <tool id="cdt.managedbuild.tool.gnu.c.compiler.so.debug.1600970468" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.so.debug"> + <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.so.debug.option.optimization.level.1028605957" name="Optimization Level" superClass="gnu.c.compiler.so.debug.option.optimization.level" value="gnu.c.optimization.level.most" valueType="enumerated"/> + <option id="gnu.c.compiler.so.debug.option.debugging.level.1237207564" name="Debug Level" superClass="gnu.c.compiler.so.debug.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> + <option id="gnu.c.compiler.option.misc.other.1175867299" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -std=c99" valueType="string"/> + <option id="gnu.c.compiler.option.include.paths.1273937011" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> + <listOptionValue builtIn="false" value="/usr/lib/jvm/java-6-openjdk/include"/> + </option> + <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1522940706" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> + </tool> + <tool id="cdt.managedbuild.tool.gnu.c.linker.so.debug.470664219" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.so.debug"> + <option defaultValue="true" id="gnu.c.link.so.debug.option.shared.1395047256" name="Shared (-shared)" superClass="gnu.c.link.so.debug.option.shared" valueType="boolean"/> + </tool> + <tool id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug.306083539" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.so.debug"> + <option defaultValue="true" id="gnu.cpp.link.so.debug.option.shared.1316858145" name="Shared (-shared)" superClass="gnu.cpp.link.so.debug.option.shared" valueType="boolean"/> + <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.573177258" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> + <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> + <additionalInput kind="additionalinput" paths="$(LIBS)"/> + </inputType> + </tool> + <tool id="cdt.managedbuild.tool.gnu.assembler.so.debug.1889047242" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.so.debug"> + <inputType id="cdt.managedbuild.tool.gnu.assembler.input.2068327306" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> + </tool> + </toolChain> + </folderInfo> + </configuration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> + </cconfiguration> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <project id="jpgf.cdt.managedbuild.target.gnu.so.1549632642" name="Shared Library" projectType="cdt.managedbuild.target.gnu.so"/> + </storageModule> + <storageModule moduleId="scannerConfiguration"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> + <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.so.release.808271744;cdt.managedbuild.config.gnu.so.release.808271744.;cdt.managedbuild.tool.gnu.c.compiler.so.release.1919617596;cdt.managedbuild.tool.gnu.c.compiler.input.1998701425"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> + </scannerConfigBuildInfo> + <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.so.debug.400252551;cdt.managedbuild.config.gnu.so.debug.400252551.;cdt.managedbuild.tool.gnu.cpp.compiler.so.debug.1459920520;cdt.managedbuild.tool.gnu.cpp.compiler.input.59690088"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> + </scannerConfigBuildInfo> + <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.so.release.808271744;cdt.managedbuild.config.gnu.so.release.808271744.;cdt.managedbuild.tool.gnu.cpp.compiler.so.release.883481825;cdt.managedbuild.tool.gnu.cpp.compiler.input.338464915"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> + </scannerConfigBuildInfo> + <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.so.debug.400252551;cdt.managedbuild.config.gnu.so.debug.400252551.;cdt.managedbuild.tool.gnu.c.compiler.so.debug.1600970468;cdt.managedbuild.tool.gnu.c.compiler.input.1522940706"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> + </scannerConfigBuildInfo> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.pathentry"/> + <storageModule moduleId="refreshScope" versionNumber="1"> + <resource resourceType="PROJECT" workspacePath="/jpgf"/> + </storageModule> +</cproject> diff --git a/src/runtime/java/.project b/src/runtime/java/.project index bd835af6f..ee427e472 100644 --- a/src/runtime/java/.project +++ b/src/runtime/java/.project @@ -6,12 +6,84 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> + <triggers>clean,full,incremental,</triggers> + <arguments> + <dictionary> + <key>?name?</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.append_environment</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.autoBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildArguments</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildCommand</key> + <value>make</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildLocation</key> + <value>${workspace_loc:/jpgf/Debug}</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> + <value>clean</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.contents</key> + <value>org.eclipse.cdt.make.core.activeConfigSettings</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableAutoBuild</key> + <value>false</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableCleanBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableFullBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.fullBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.stopOnError</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> + <triggers>full,incremental,</triggers> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.cdt.core.cnature</nature> + <nature>org.eclipse.cdt.core.ccnature</nature> + <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> + <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> </natures> </projectDescription> diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile deleted file mode 100644 index e5849087c..000000000 --- a/src/runtime/java/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -all: libjpgf.la Test.class - -install: - libtool --mode=install cp libjpgf.la /usr/lib/libjpgf.la - -doc: - javadoc org.grammaticalframework.pgf - -Test.class: Test.java - javac Test.java - -libjpgf.jar: org/grammaticalframework/pgf/PGF.class - jar -cf libjpgf.jar org/grammaticalframework/pgf/*.class - -org/grammaticalframework/pgf/PGF.class: org/grammaticalframework/pgf/PGF.java - javac Test.java - -org/grammaticalframework/pgf/Concr.class: org/grammaticalframework/pgf/Concr.java - javac Test.java - -libjpgf.la: jpgf.lo - libtool --mode=link gcc -g -O -o libjpgf.la jpgf.lo -rpath /usr/lib -lpgf -lgu - -jpgf.lo: jpgf.c org_grammaticalframework_pgf_PGF.h org_grammaticalframework_pgf_Concr.h - libtool --mode=compile gcc -I /usr/lib/jvm/java-6-openjdk/include -std=c99 -c jpgf.c - -org_grammaticalframework_pgf_PGF.h: org/grammaticalframework/pgf/PGF.class - javah org.grammaticalframework.pgf.PGF - -org_grammaticalframework_pgf_Concr.h: org/grammaticalframework/pgf/Concr.class - javah org.grammaticalframework.pgf.Concr diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c index 757667c75..76218c005 100644 --- a/src/runtime/java/jpgf.c +++ b/src/runtime/java/jpgf.c @@ -2,7 +2,7 @@ #include <gu/mem.h> #include <gu/exn.h> #include <alloca.h> -#include "org_grammaticalframework_pgf_PGF.h" +#include <jni.h> static jstring gu2j_string(JNIEnv *env, GuString s) { |