diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | README | 46 | ||||
| -rw-r--r-- | build.examples.xml | 2 | ||||
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | lib/ant-contrib.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | src/build/old_sabbus.xml | 2 |
6 files changed, 28 insertions, 27 deletions
diff --git a/.classpath b/.classpath index 36151c95b9..dba8b04d19 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="lib" path="build/quick/lib/compiler/"/> <classpathentry kind="lib" path="lib/fjbg.jar"/> <classpathentry kind="lib" path="lib/msil.jar"/> - <classpathentry kind="lib" path="lib/ant-contrib.jar"/> + <classpathentry kind="lib" path="lib/ant/ant-contrib.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry exported="true" kind="lib" path="build/quick/lib/library" sourcepath="src/library"/> @@ -15,28 +15,30 @@ part of the Subversion repository but are either automatically generated by the build script or user-created if needed. scala/ - build/ † Temporary staging area for build products. - build.excludes † An optional build configuration file. - build.number The version number of the current distribution. - build.properties † An optional build configuration file. - build.xml The main Ant build script. - dist/ † The destination folder of Scala distributions. - docs/ Documentation of Scala. More in its own module. - development/ Developer documentation. - examples/ Scala example files. - man/ UNIX manual files. - lib/ Pre-compiled libraries for the build. - ant-contrib.jar Support libraries for the build tool. - fjbg.jar The Java byte-code generation library. - jaco.jar The JaCo Java compiler. - scala-compiler.jar The last stable version of the Scala compiler. - scala-library.jar The last stable version of the Scala library. - README The file you are currently reading. - sandbox/ † A folder to test code etc. - src/ All the source files of Scala. - compiler/ The sources of the Scala compiler. - library/ The sources of the Scala library. - test/ The Scala test suite. + build/ † Temporary staging area for build products. + build.excludes † An optional build configuration file. + build.number The version number of the current distribution. + build.properties † An optional build configuration file. + build.xml The main Ant build script. + dist/ † The destination folder of Scala distributions. + docs/ Documentation of Scala. More in its own module. + development/ Developer documentation. + examples/ Scala example files. + man/ UNIX manual files. + lib/ Pre-compiled libraries for the build. + fjbg.jar The Java byte-code generation library. + jaco.jar The JaCo Java compiler. + scala-compiler.jar The last stable version of the Scala compiler. + scala-library.jar The last stable version of the Scala library. + ant/ Support libraries for the build tool. + ant-contrib.jar Provides additional features for Ant + vizant.jar Provides DOT graph generation for Ant + README The file you are currently reading. + sandbox/ † A folder to test code etc. + src/ All the source files of Scala. + compiler/ The sources of the Scala compiler. + library/ The sources of the Scala library. + test/ The Scala test suite. Any change to this structure requires a modification of the 'build.xml' file. diff --git a/build.examples.xml b/build.examples.xml index 9f9a7fa866..3c5ab045db 100644 --- a/build.examples.xml +++ b/build.examples.xml @@ -32,7 +32,7 @@ PROPERTIES <property name="fjbg.name" value="fjbg.jar"/> <property name="fjbg.jar" value="${lib.dir}/${fjbg.name}"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> - <property name="ant-contrib.jar" value="${lib.dir}/ant-contrib.jar"/> + <property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/> <!-- --> <property name="build.dir" value="${basedir}/build"/> <property name="build.examples.dir" value="${build.dir}/examples"/> @@ -109,7 +109,7 @@ INITIALISATION <target name="init"> <!-- Setting-up Ant contrib tasks --> - <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant-contrib.jar"/> + <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> <!-- This is the start time for the distribution --> <tstamp prefix="time"> <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/> diff --git a/lib/ant-contrib.jar.desired.sha1 b/lib/ant-contrib.jar.desired.sha1 deleted file mode 100644 index 56745657c5..0000000000 --- a/lib/ant-contrib.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -943cd5c8802b2a3a64a010efb86ec19bac142e40 ?ant-contrib.jar diff --git a/src/build/old_sabbus.xml b/src/build/old_sabbus.xml index f8f8dab8c6..aa3d1ecb1d 100644 --- a/src/build/old_sabbus.xml +++ b/src/build/old_sabbus.xml @@ -51,7 +51,7 @@ PROPERTIES <property name="msil.jar" value="${lib.dir}/msil.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="jline.jar" value="${lib.dir}/jline.jar"/> - <property name="ant-contrib.jar" value="${lib.dir}/ant-contrib.jar"/> + <property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/> <!-- Sets location of build folders --> <property name="build.dir" value="${basedir}/build"/> |