Skip to content

Commit

Permalink
Bump to WALA 1.6.0; remove custom WALA build (#25)
Browse files Browse the repository at this point in the history
- Use WALA 1.6.0 from Maven,.
- Remove the custom WALA build.
- Some Eclipse metadata changes.
  • Loading branch information
khatchad authored Jan 21, 2023
1 parent 6c85f99 commit a8e1d8e
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
6 changes: 6 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
Expand All @@ -19,5 +24,6 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions .pydevproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
</pydev_project>
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dist: focal
language: java
jdk: openjdk11
before_install:
- git clone --depth=500 https://github.com/wala/WALA /tmp/WALA
- git clone --depth=50 https://github.com/wala/IDE /tmp/IDE
- git clone https://github.com/juliandolby/jython3.git /tmp/jython3
install:
Expand All @@ -13,10 +12,6 @@ install:
- mvn install:install-file -Dfile=./jython-dev.jar -DgroupId="org.python" -DartifactId="jython3" -Dversion="0.0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom=true
- popd
- popd
- pushd /tmp/WALA
- git checkout v1.5.9
- ./gradlew publishLocalPublicationToMavenLocal
- popd
- pushd /tmp/IDE/com.ibm.wala.cast.lsp
- mvn clean install -B -q -DskipTests
- popd
Expand Down
6 changes: 0 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ You must install the `jython-dev.jar` to your local maven repository.
1. Change directory to `com.ibm.wala.cast.lsp`: `cd com.ibm.wala.cast.lsp`
1. Build and install to your local Maven repo: `mvn install`

### Installing WALA

1. Clone the [WALA repository][WALA].
1. Checkout the tag corresponding to the version needed, e.g., `git checkout v1.5.9`. You need to match this version with the WALA version in the `pom.xml` file found in *this* repository.
1. Build and deploy WALA to your local maven repository. This is necessary because the test JARs are not published on Maven Central: `./gradlew publishLocalPublicationToMavenLocal`.

### Building WALA/ML

1. Clone the [WALA/ML repository][WALA/ML].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
encoding/data=UTF-8
encoding/source=UTF-8
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maven.compiler.version>3.10.1</maven.compiler.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-alias>b000</build-alias>
<wala.version>1.5.9</wala.version>
<wala.version>1.6.0</wala.version>
<maven.surefire.version>3.0.0-M7</maven.surefire.version>
</properties>
<distributionManagement>
Expand Down

0 comments on commit a8e1d8e

Please sign in to comment.