mirror of
https://github.com/processing/processing4.git
synced 2026-01-28 10:51:07 +01:00
rolling back non-source changes from 4f21049
This commit is contained in:
@@ -181,8 +181,8 @@
|
||||
|
||||
<!--
|
||||
<antcall target="download-ant" />
|
||||
<antcall target="download-jna" />
|
||||
<antcall target="download-flatlaf" />
|
||||
<antcall target="download-jna" />
|
||||
-->
|
||||
</target>
|
||||
|
||||
|
||||
@@ -65,4 +65,4 @@
|
||||
</library>
|
||||
</orderEntry>
|
||||
</component>
|
||||
</module>
|
||||
</module>
|
||||
@@ -377,11 +377,6 @@
|
||||
<include name="theme/**" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${target.path}/modes/java/mode" preservelastmodified="true">
|
||||
<fileset dir="../java/lib">
|
||||
<include name="**/*.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- get the examples folder, but don't require it to buid -->
|
||||
<copy todir="${target.path}/modes/java/examples"
|
||||
|
||||
1
java/.gitignore
vendored
1
java/.gitignore
vendored
@@ -3,4 +3,3 @@ bin
|
||||
bin-test
|
||||
generated
|
||||
mode/JavaMode.jar
|
||||
ivy.jar
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0"?>
|
||||
<project name="Java Mode" default="build" xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||
<project name="Java Mode" default="build">
|
||||
|
||||
<property name="generated"
|
||||
value="${basedir}/generated/processing/mode/java/preproc" />
|
||||
@@ -18,34 +18,6 @@
|
||||
<classpath path="${antlr_jar}" />
|
||||
</classloader>
|
||||
|
||||
<property name="ivy.version" value="2.5.0" />
|
||||
<fileset id="ivy.files" dir="lib">
|
||||
<include name="ivy.jar" />
|
||||
</fileset>
|
||||
<property name="ivy.url"
|
||||
value="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
|
||||
|
||||
<available file="ivy.jar" property="ivy.present" />
|
||||
|
||||
<condition property="ivy.ignorable" value="false" else="true">
|
||||
<isset property="ivy.present" />
|
||||
</condition>
|
||||
|
||||
<target name="download-ivy" unless="ivy.present">
|
||||
<get src="${ivy.url}" dest="ivy.jar"
|
||||
ignoreerrors="${ivy.ignorable}"
|
||||
usetimestamp="true" />
|
||||
</target>
|
||||
|
||||
<target name="init-ivy" depends="download-ivy">
|
||||
<taskdef resource="org/apache/ivy/ant/antlib.xml"
|
||||
uri="antlib:org.apache.ivy.ant" classpath="ivy.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="download-ivy-dependencies" depends="init-ivy">
|
||||
<ivy:retrieve />
|
||||
</target>
|
||||
|
||||
<target name="clean" description="Clean the build directories">
|
||||
<delete dir="bin" />
|
||||
<delete dir="bin-test" />
|
||||
@@ -60,11 +32,6 @@
|
||||
<include name="*.properties" />
|
||||
</fileset>
|
||||
</delete>
|
||||
<delete>
|
||||
<fileset dir="lib">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
<target name="preproc" description="Compile ANTLR 4 grammar">
|
||||
@@ -104,8 +71,6 @@
|
||||
<pathelement location="mode/org.eclipse.jdt.core.jar" />
|
||||
<pathelement location="mode/org.eclipse.osgi.jar" />
|
||||
<pathelement location="mode/org.eclipse.text.jar" />
|
||||
<pathelement location="mode/org.eclipse.ui.workbench.jar" />
|
||||
<fileset dir="lib" includes="*.jar" />
|
||||
</path>
|
||||
|
||||
<path id="classpath.test">
|
||||
@@ -158,7 +123,7 @@
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="test-compile" depends="preproc, download-ivy-dependencies">
|
||||
<target name="test-compile" depends="preproc">
|
||||
<compilecommon srcdir="src; test/processing" destdir="bin-test" classpath="classpath.test" />
|
||||
</target>
|
||||
|
||||
@@ -175,7 +140,7 @@
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="compile" description="Compile sources" depends="preproc, download-ivy-dependencies">
|
||||
<target name="compile" description="Compile sources" depends="preproc">
|
||||
<compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
|
||||
</target>
|
||||
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ivy-module version="2.0">
|
||||
<info organisation="" module="" />
|
||||
<dependencies>
|
||||
<dependency org="org.eclipse.lsp4j" name="org.eclipse.lsp4j" rev="0.12.0"/>
|
||||
</dependencies>
|
||||
</ivy-module>
|
||||
1
java/lib/.gitignore
vendored
1
java/lib/.gitignore
vendored
@@ -1 +0,0 @@
|
||||
*.jar
|
||||
Reference in New Issue
Block a user