diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 96c12c7..21a5f93 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -16,19 +16,20 @@ jobs: steps: - name: checkout TPTP-ANTLR - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: checkout SigmaUtils - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'ontologyportal/SigmaUtils' +# repository: 'terry-norbraten/SigmaUtils' ref: 'main' - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' - name: Build with Ant - run: ant -noinput -buildfile build.xml + run: ant diff --git a/.gitignore b/.gitignore index 3c6ef0d..3baffe2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ lib build/ tptp.jar +/nbproject/private/ diff --git a/build.xml b/build.xml index 2d8a26e..32abdce 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,6 @@ name="TPTP" default="all" basedir="."> - @@ -10,12 +9,17 @@ - + - + + + + + + - @@ -40,10 +43,6 @@ Java Version via Ant: ${ant.java.version} Java Version System Prop: ${java.version} - - - - @@ -51,13 +50,18 @@ - + - + @@ -103,7 +107,7 @@ - + @@ -113,4 +117,17 @@ the system date/time is ${TODAY_US} + + + + + + + + + + + + + diff --git a/ivy.xml b/ivy.xml index 9827ecc..5deec86 100644 --- a/ivy.xml +++ b/ivy.xml @@ -1,7 +1,14 @@ + + + + + + + - - + + \ No newline at end of file diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..2f02da6 --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,84 @@ + + + org.netbeans.modules.ant.freeform + + + + TPTP + + + + + java + src/java + + + + java + test/src/main/java + + + + + all + + + test + + + compile + + + + folder + build/classes + compile + + + folder + build/test-classes/tptp_parser + compile + + + + + + src/java + + + + test/src/main/java + + + build.xml + + + + + + + + + + + + src/java + lib/antlr-runtime-3.5.2.jar:lib/antlr4-4.9.3.jar:lib/antlr4-runtime-4.9.3.jar:lib/icu4j-69.1.jar:lib/javax.json-1.0.4.jar:lib/org.abego.treelayout.core-1.0.3.jar:lib/sigmaUtils.jar:lib/ST4-4.3.1.jar + build/classes + 11 + + + test/src/main/java + + build/classes:lib/antlr-runtime-3.5.2.jar:lib/antlr4-4.9.3.jar:lib/antlr4-runtime-4.9.3.jar:lib/hamcrest-core-1.3.jar:lib/icu4j-69.1.jar:lib/javax.json-1.0.4.jar:lib/junit-4.13.2.jar:lib/org.abego.treelayout.core-1.0.3.jar:lib/sigmaUtils.jar:lib/ST4-4.3.1.jar + build/test-classes/tptp_parser + 11 + + + +