Skip to content

Commit 4ee07d0

Browse files
committed
Merge branch 'master' of github.com:DrJavaAtRice/drjava
Conflicts: drjava/src/edu/rice/cs/drjava/config/OptionConstants.java drjava/src/edu/rice/cs/drjava/ui/config/ConfigDescriptions.java drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java javalanglevels/src/edu/rice/cs/javalanglevels/BodyTypeChecker.java javalanglevels/src/edu/rice/cs/javalanglevels/ExpressionTypeChecker.java javalanglevels/src/edu/rice/cs/javalanglevels/TypeChecker.java
2 parents 66855f1 + 272a565 commit 4ee07d0

File tree

235 files changed

+20050
-32941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+20050
-32941
lines changed

docs/build.xml

Lines changed: 3 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<project name="docs" default="help">
88

99
<property name="readable-project-name" value="DrJava Documentation" />
10-
<property name="svn-repository" value="https://svn.sourceforge.net/svnroot/drjava" />
1110

1211
<property environment="env" />
1312
<property name="docbook-xsl-home" value="${env.DOCBOOK_XSL_HOME}" />
@@ -37,8 +36,8 @@
3736
<echo message="For this build file to function properly, the following environment " />
3837
<echo message="variables should be defined:" />
3938
<echo message="DOCBOOK_XSL_HOME: Location of the DocBook XSL style sheets" />
40-
<echo message="PATH: 'xsltproc' must be available; 'svn' needs to refer to the" />
41-
<echo message=" Subversion client executable" />
39+
<echo message="PATH: 'xsltproc' must be available; 'git' needs to refer to the" />
40+
<echo message=" git client executable" />
4241
<echo message="" />
4342
<echo message="Ant may also require ANT_HOME to be set. Note that the value of " />
4443
<echo message="CLASSPATH will be ignored -- classes on the system classpath will " />
@@ -257,68 +256,6 @@
257256
</target>
258257

259258

260-
<!-- ******************
261-
Subversion Targets
262-
****************** -->
263-
264-
<target name="update" depends="clean" description="Reconcile source with the Subversion archive">
265-
<echo message="Running Subversion update" />
266-
<exec executable="svn" failonerror="yes">
267-
<arg value="update" />
268-
</exec>
269-
<exec executable="svn" failonerror="yes">
270-
<arg value="status" />
271-
</exec>
272-
</target>
273-
274-
<target name="commit" depends="update, build"
275-
description="Commit source to the Subversion archive (after building)">
276-
<antcall target="clean-intermediate"> <!-- Clean up after the latest build -->
277-
<param name="clean-can-fail" value="no" />
278-
</antcall>
279-
<exec executable="svn" failonerror="yes">
280-
<arg value="status" />
281-
</exec>
282-
<input message="Please enter a log message for the commit: "
283-
addproperty="svn-commit-message" />
284-
<echo message="Running Subversion commit" />
285-
<exec executable="svn" failonerror="yes">
286-
<arg value="commit" />
287-
<arg value="-m" />
288-
<arg value="${svn-commit-message}" />
289-
</exec>
290-
</target>
291-
292-
<target name="tag" depends="update, resolve-version-tag"
293-
description="Copy the working copy to a new Subversion tag (after updating)">
294-
<echo message="Creating a new Subversion tag with name ${version-tag}"/>
295-
<exec executable="svn" failonerror="yes">
296-
<arg value="copy" />
297-
<arg value="${basedir}" />
298-
<arg value="${svn-repository}/tags/${version-tag}" />
299-
<arg value="-m" />
300-
<arg value="Created tag ${version-tag}" />
301-
</exec>
302-
</target>
303-
304-
<target name="branch" depends="update"
305-
description="Copy the working copy to a new Subversion branch (after updating)">
306-
<echo message="This will create a new branch from your working copy. If there are changes " />
307-
<echo message="in your copy that have not been committed, you may want to do so first, " />
308-
<echo message="so that there's a clear branch point for merging later." />
309-
<input message="Enter a name for the new branch: "
310-
addproperty="svn-branch-name" />
311-
<echo message="Creating a new Subversion branch ${svn-branch-name}" />
312-
<exec executable="svn" failonerror="yes">
313-
<arg value="copy" />
314-
<arg value="${basedir}" />
315-
<arg value="${svn-repository}/branches/${svn-branch-name}" />
316-
<arg value="-m" />
317-
<arg value="Created branch ${svn-branch-name}" />
318-
</exec>
319-
</target>
320-
321-
322259
<!-- ***************
323260
Release Targets
324261
*************** -->
@@ -336,7 +273,7 @@
336273
</target>
337274

338275
<target name="release"
339-
depends="update, build, tag, jar-app, src-zip"
276+
depends="build, jar-app"
340277
description="Generate all release files (after building)">
341278
<delete dir="${version-tag}" />
342279
</target>
@@ -346,17 +283,6 @@
346283
<copy file="${ant.project.name}.jar" tofile="${version-tag}.jar" />
347284
</target>
348285

349-
<target name="src-zip" depends="resolve-version-tag">
350-
<echo message="Creating ${version-tag}-src.zip" />
351-
<exec executable="svn" failonerror="yes">
352-
<arg value="export" />
353-
<arg value="${svn-repository}/tags/${version-tag}" />
354-
<arg value="${version-tag}/src" />
355-
</exec>
356-
<zip destfile="${version-tag}-src.zip">
357-
<zipfileset dir="${version-tag}/src" prefix="${version-tag}/src" />
358-
</zip>
359-
</target>
360286

361287

362288
<!-- ********************************
@@ -384,9 +310,6 @@
384310
</replace>
385311
</target>
386312

387-
<!-- Standardize all newline character sequences. Subversion takes care of this
388-
automatically, but sometimes files crop up with the wrong sequence.
389-
Use "svn status" after running this to see which files were fixed. -->
390313
<target name="fix-newlines" description="Standardize newline character sequences in all text files">
391314
<!-- If we're in Windows, use \r\n -->
392315
<condition property="newline-code" value="crlf">

0 commit comments

Comments
 (0)