diff options
| author | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
|---|---|---|
| committer | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
| commit | 23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4 (patch) | |
| tree | 5e159ce51df5436a7ab5aeb18c0edb0605a1c2f1 /buildScripts | |
| parent | 2b4b5c983540af4a4c08cfb7a3d4057df0b84c39 (diff) | |
| parent | 9148294f78a8e646ee131ca182a9b692bc028fdb (diff) | |
| download | lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.gz lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.bz2 lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.zip | |
Merge branch 'master' into eclipse-javadoc
Conflicts:
src/core/lombok/javac/handlers/JavacHandlerUtil.java
test/core/src/lombok/RunTestsViaEcj.java
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/info.ant.xml | 5 | ||||
| -rw-r--r-- | buildScripts/ivy.xml | 2 | ||||
| -rw-r--r-- | buildScripts/tests.ant.xml | 1 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 13 |
4 files changed, 21 insertions, 0 deletions
diff --git a/buildScripts/info.ant.xml b/buildScripts/info.ant.xml index 55fea8af..fe6e0ee3 100644 --- a/buildScripts/info.ant.xml +++ b/buildScripts/info.ant.xml @@ -258,6 +258,11 @@ build/website. 'pack' bzips this up, ready to ship to the server. 'publish' sends this to the server and runs a script to deploy. + > ant website.open + + First builds the website, then hosts it locally and opens it in your browser so + you can see the website in its full, template-applied form. + > ant latest-changes.build Makes a changelog variant that lists only the newest changes; it is included diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 14530f06..3dfbde7e 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -58,6 +58,7 @@ <dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildtools->build" /> <dependency org="de.java2html" name="java2html" rev="5.0" conf="buildtools->default" /> <dependency org="org.freemarker" name="freemarker" rev="2.3.28" conf="buildtools->default" /> + <dependency org="com.sparkjava" name="spark-core" rev="2.9.2" conf="buildtools->default" /> <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" rev="5.2.0.201812061821-r" conf="supporters->default" /> <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="5.2.0.201812061821-r" conf="supporters->default" /> @@ -93,6 +94,7 @@ <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.22.0" conf="eclipse-202006->default" transitive="false" /> <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.21.100" conf="eclipse-202006->default" transitive="false" /> <dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.12.0" conf="eclipse-202006->default" transitive="false" /> + <dependency org="org.eclipse.platform" name="org.eclipse.equinox.preferences" rev="3.8.0" conf="eclipse-202006->default" transitive="false" /> <dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.13.700" conf="eclipse-202006->default" transitive="false" /> <dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.10.800" conf="eclipse-202006->default" transitive="false" /> <dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.15.300" conf="eclipse-202006->default" transitive="false" /> diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index f78bfae9..cb840048 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -119,6 +119,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn <classpath refid="cp.stripe" /> <classpath location="build/lombok" /> <classpath location="build/tests" /> + <classpath location="build/teststubs" /> <test name="lombok.TestJavac" /> </junit> </sequential> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 9efb2668..730b79c2 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -150,6 +150,19 @@ such as applying the templates to produce the website, converting the changelog <website.make version="${lombok.version.live}" fullversion="${lombok.fullversion.live}" cmd="all" /> </target> + <target name="website.open" depends="website.build, compile.support" description="Builds the website, then serves it locally, opening a browser."> + <local name="dir.build.website" /> + <property name="dir.build.website" location="build/website" /> + <java classname="lombok.website.RunSite" failonerror="true"> + <classpath> + <path refid="cp.buildtools" /> + <pathelement location="build/support" /> + </classpath> + <arg value="${dir.build.website}" /> + <arg value="open" /> + </java> + </target> + <target name="website.print-all-versions" depends="compile.support"> <java classname="lombok.website.WebsiteMaker" failonerror="true"> <classpath> |