create symlink for shib-tools.sh and chmod +x. (and fix line endings)
authorwnorris <wnorris@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 19 Jun 2007 00:08:21 +0000 (00:08 +0000)
committerwnorris <wnorris@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 19 Jun 2007 00:08:21 +0000 (00:08 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2252 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

build.xml

index 552f4e9..f2baa86 100755 (executable)
--- a/build.xml
+++ b/build.xml
 
        <tstamp>
                <format property="build-date" pattern="ddMMyyyy'T'kkmmss" timezone="GMT" />
-       </tstamp>\r
+       </tstamp>
 
        <!-- User based property file that overrides any property below -->
        <property file="${user.name}-build.properties" />
 
-       <!-- Project based property file -->\r
+       <!-- Project based property file -->
        <property file="build.properties" />
 
        <!-- Installation specific property file -->
-       <property file="install.properties" />\r
-\r
-       <!-- Load ant-contrib tasks -->\r
+       <property file="install.properties" />
+
+       <!-- Load ant-contrib tasks -->
        <taskdef resource="net/sf/antcontrib/antlib.xml" />
 
        <!-- Load Checkstyle tasks -->
-       <taskdef resource="checkstyletask.properties" />\r
-\r
-       <!-- Classpath for building core classes-->\r
-       <path id="build-path">\r
-               <fileset dir="${build-lib.dir}" includes="**/*.jar" />\r
-               <fileset dir="${lib.dir}" includes="**/*.jar" />\r
-       </path>\r
-\r
-       <!-- Classpath for testing classes-->\r
-       <path id="test-path">\r
-               <path refid="build-path" />\r
-               <pathelement location="${core-classes.dir}" />\r
-               <pathelement location="${core-src.dir}" />\r
+       <taskdef resource="checkstyletask.properties" />
+
+       <!-- Classpath for building core classes-->
+       <path id="build-path">
+               <fileset dir="${build-lib.dir}" includes="**/*.jar" />
+               <fileset dir="${lib.dir}" includes="**/*.jar" />
+       </path>
+
+       <!-- Classpath for testing classes-->
+       <path id="test-path">
+               <path refid="build-path" />
+               <pathelement location="${core-classes.dir}" />
+               <pathelement location="${core-src.dir}" />
                <pathelement location="${test-classes.dir}" />
                <pathelement location="${test-classes.dir}/data" />
-               <pathelement location="${test-classes.dir}/log4j.xml" />\r
-               <pathelement location="${test-src.dir}" />\r
-               <pathelement location="${classpathres.dir}" />\r
-       </path>\r
-\r
-       <!-- Prepare directory structure for build -->\r
-       <target name="build-init">\r
-               <mkdir dir="${build.dir}" />\r
-       </target>\r
-\r
-       <!-- Compile core (non-test) classes -->\r
-       <target name="compile-core" depends="build-init, clean-compile">\r
-               <mkdir dir="${core-classes.dir}" />\r
-\r
-               <javac srcdir="${core-src.dir}" destdir="${core-classes.dir}" includes="**/*.java" debug="on" source="1.5">\r
-                       <classpath refid="build-path" />\r
-               </javac>\r
-\r
-       </target>\r
-\r
-       <!-- Compile unit test classes -->\r
-       <target name="compile-test" depends="compile-core">\r
-               <mkdir dir="${test-classes.dir}" />\r
-\r
-               <javac srcdir="${test-src.dir}" destdir="${test-classes.dir}" includes="**/*.java" debug="on" source="1.5">\r
-                       <classpath refid="test-path" />\r
-               </javac>\r
-\r
-       </target>\r
-\r
-       <!-- Compile and run unit tests -->\r
-       <target name="test" depends="compile-core, compile-test" description="Runs the unit tests for the project.">\r
-               <mkdir dir="${test-results.dir}" />\r
-\r
-               <echo message="Excuting unit tests using endorsed directory ${java.endorsed.dirs}" />\r
-               <junit printsummary="off"\r
-                      fork="yes"\r
-                      forkmode="once"\r
-                      haltonerror="false"\r
-                      haltonfailure="false"\r
-                      dir="${basedir}"\r
-                      errorproperty="testFailed">\r
-                       <jvmarg value="-Djava.endorsed.dirs=${java.endorsed.dirs}" />\r
-                       <classpath refid="test-path" />\r
-                       <formatter type="xml" />\r
-                       <batchtest todir="${test-results.dir}">\r
-                               <fileset dir="${test-classes.dir}">\r
-                                       <include name="**/*Test.class" />\r
-                               </fileset>\r
-                       </batchtest>\r
-               </junit>\r
-               <junitreport todir="${test-results.dir}">\r
-                       <fileset dir="${test-results.dir}">\r
-                               <include name="TEST-*.xml" />\r
-                       </fileset>\r
-                       <report format="frames" todir="${test-report.dir}" />\r
+               <pathelement location="${test-classes.dir}/log4j.xml" />
+               <pathelement location="${test-src.dir}" />
+               <pathelement location="${classpathres.dir}" />
+       </path>
+
+       <!-- Prepare directory structure for build -->
+       <target name="build-init">
+               <mkdir dir="${build.dir}" />
+       </target>
+
+       <!-- Compile core (non-test) classes -->
+       <target name="compile-core" depends="build-init, clean-compile">
+               <mkdir dir="${core-classes.dir}" />
+
+               <javac srcdir="${core-src.dir}" destdir="${core-classes.dir}" includes="**/*.java" debug="on" source="1.5">
+                       <classpath refid="build-path" />
+               </javac>
+
+       </target>
+
+       <!-- Compile unit test classes -->
+       <target name="compile-test" depends="compile-core">
+               <mkdir dir="${test-classes.dir}" />
+
+               <javac srcdir="${test-src.dir}" destdir="${test-classes.dir}" includes="**/*.java" debug="on" source="1.5">
+                       <classpath refid="test-path" />
+               </javac>
+
+       </target>
+
+       <!-- Compile and run unit tests -->
+       <target name="test" depends="compile-core, compile-test" description="Runs the unit tests for the project.">
+               <mkdir dir="${test-results.dir}" />
+
+               <echo message="Excuting unit tests using endorsed directory ${java.endorsed.dirs}" />
+               <junit printsummary="off"
+                      fork="yes"
+                      forkmode="once"
+                      haltonerror="false"
+                      haltonfailure="false"
+                      dir="${basedir}"
+                      errorproperty="testFailed">
+                       <jvmarg value="-Djava.endorsed.dirs=${java.endorsed.dirs}" />
+                       <classpath refid="test-path" />
+                       <formatter type="xml" />
+                       <batchtest todir="${test-results.dir}">
+                               <fileset dir="${test-classes.dir}">
+                                       <include name="**/*Test.class" />
+                               </fileset>
+                       </batchtest>
+               </junit>
+               <junitreport todir="${test-results.dir}">
+                       <fileset dir="${test-results.dir}">
+                               <include name="TEST-*.xml" />
+                       </fileset>
+                       <report format="frames" todir="${test-report.dir}" />
                </junitreport>
 
                <echo message="Test report available at ${test-report.dir}/index.html" />
-               <fail if="testFailed" message="Test failure; see ${test-report.dir}/index.html for more information." />\r
-       </target>\r
-\r
-       <!-- Javadoc core (non-test) classes -->\r
-       <target name="javadoc" description="Creates the JavaDoc documentatin for the project.">\r
-               <mkdir dir="${javadoc.dir}" />\r
-               <javadoc packagenames="org.opensaml.*"\r
-                        sourcepath="${core-src.dir}"\r
-                        destdir="${javadoc.dir}"\r
-                        author="false"\r
-                        version="true"\r
-                        windowtitle="${ant.project.name} ${version} Java API"\r
-                        doctitle="${ant.project.name} ${version} Java API"\r
-                        bottom="${copyright}"\r
-                        overview="${core-src.dir}/overview.html">\r
-                       <classpath refid="build-path" />\r
-               </javadoc>\r
-       </target>\r
-\r
-       <!-- Removes previously compiled files -->\r
-       <target name="clean-compile">\r
+               <fail if="testFailed" message="Test failure; see ${test-report.dir}/index.html for more information." />
+       </target>
+
+       <!-- Javadoc core (non-test) classes -->
+       <target name="javadoc" description="Creates the JavaDoc documentatin for the project.">
+               <mkdir dir="${javadoc.dir}" />
+               <javadoc packagenames="org.opensaml.*"
+                        sourcepath="${core-src.dir}"
+                        destdir="${javadoc.dir}"
+                        author="false"
+                        version="true"
+                        windowtitle="${ant.project.name} ${version} Java API"
+                        doctitle="${ant.project.name} ${version} Java API"
+                        bottom="${copyright}"
+                        overview="${core-src.dir}/overview.html">
+                       <classpath refid="build-path" />
+               </javadoc>
+       </target>
+
+       <!-- Removes previously compiled files -->
+       <target name="clean-compile">
                <delete dir="${build.dir}" />
-               <delete dir="${dist.dir}" />\r
-       </target>\r
-\r
-       <!-- Removes all build generated content -->\r
-       <target name="clean" depends="clean-compile" description="Removes any artifact produced by the build process.">\r
+               <delete dir="${dist.dir}" />
+       </target>
+
+       <!-- Removes all build generated content -->
+       <target name="clean" depends="clean-compile" description="Removes any artifact produced by the build process.">
                <delete dir="${javadoc.dir}" />
-               <delete dir="${reports.dir}" />\r
-               <delete dir="${dist.dir}" />\r
-       </target>\r
-\r
-       <!-- Create JAR file -->\r
-       <target name="package" depends="compile-core" description="Creates the project library jar file.">\r
-               <mkdir dir="${dist.dir}" />\r
-\r
-               <if>\r
-                       <equals arg1="${jdk.target}" arg2="1.4" />\r
-                       <then>\r
-                               <java classname="com.rc.retroweaver.Weaver">\r
-                                       <arg value="-source" />\r
-                                       <arg value="${core-classes.dir}" />\r
-                                       <classpath>\r
-                                               <fileset dir="${thirdpaty-lib.dir}">\r
-                                                       <include name="**/*.jar" />\r
-                                               </fileset>\r
-                                       </classpath>\r
-                               </java>\r
-\r
-                               <echo message="**************************************************************" />\r
-                               <echo message="    Remember, you must include the retroweaver-rt jar" />\r
-                               <echo message="    file, located in the thirdparty-lib directory, along with the" />\r
-                               <echo message="    ${jar.name} on your" />\r
-                               <echo message="    classpath in order to use this with JDK 1.4" />\r
-                               <echo message="**************************************************************" />\r
-\r
-                       </then>\r
-               </if>\r
+               <delete dir="${reports.dir}" />
+               <delete dir="${dist.dir}" />
+       </target>
+
+       <!-- Create JAR file -->
+       <target name="package" depends="compile-core" description="Creates the project library jar file.">
+               <mkdir dir="${dist.dir}" />
+
+               <if>
+                       <equals arg1="${jdk.target}" arg2="1.4" />
+                       <then>
+                               <java classname="com.rc.retroweaver.Weaver">
+                                       <arg value="-source" />
+                                       <arg value="${core-classes.dir}" />
+                                       <classpath>
+                                               <fileset dir="${thirdpaty-lib.dir}">
+                                                       <include name="**/*.jar" />
+                                               </fileset>
+                                       </classpath>
+                               </java>
+
+                               <echo message="**************************************************************" />
+                               <echo message="    Remember, you must include the retroweaver-rt jar" />
+                               <echo message="    file, located in the thirdparty-lib directory, along with the" />
+                               <echo message="    ${jar.name} on your" />
+                               <echo message="    classpath in order to use this with JDK 1.4" />
+                               <echo message="**************************************************************" />
+
+                       </then>
+               </if>
 
                <jar destfile="${dist.dir}/${jar.name}" whenempty="fail">
                        <fileset dir="${classpathres.dir}" />
                                <filter token="IDP_VERSION" value="${version}" />
                        </filterset>
                </copy>
-\r
+
                <jar destfile="${dist.dir}/${war.name}" whenempty="fail">
                        <zipfileset dir="${webinf-temp.dir}" prefix="WEB-INF/" />
                        <zipfileset dir="${webpages.dir}" prefix="" />
                        <zipfileset dir="${lib.dir}" prefix="WEB-INF/lib/" />
-                       <zipfileset file="${dist.dir}/${jar.name}" prefix="WEB-INF/lib/" />\r
-               </jar>\r
-\r
+                       <zipfileset file="${dist.dir}/${jar.name}" prefix="WEB-INF/lib/" />
+               </jar>
+
        </target>
 
        <target name="install" depends="package" description="Installs the identity provider software.">
                        </filterset>
                </copy>
 
+               <symlink link="${idp.home}/bin/aacli.sh" resource="shib-tools.sh" />
+               <chmod file="${idp.home}/bin/*.sh" perm="+x" />
+
                <copy todir="${idp.home}/war" file="${dist.dir}/${war.name}" preservelastmodified="true" />
 
-       </target>\r
-\r
-       <!-- **************************************************************** -->\r
-       <!-- ***                                                          *** -->\r
-       <!-- ***                     Developer Tasks                      *** -->\r
-       <!-- ***                                                          *** -->\r
-       <!-- **************************************************************** -->\r
+       </target>
+
+       <!-- **************************************************************** -->
+       <!-- ***                                                          *** -->
+       <!-- ***                     Developer Tasks                      *** -->
+       <!-- ***                                                          *** -->
+       <!-- **************************************************************** -->
 
        <!-- Checks code against style guidelines -->
        <target name="checkstyle" description="Developer task: Produces coding standard compliance report.">
                        <fileset dir="src" includes="**/*.java" />
                        <formatter type="plain" toFile="${reports.dir}/checkstyle-report.txt" />
                </checkstyle>
-       </target>\r
-\r
-</project>
\ No newline at end of file
+       </target>
+
+</project>