You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@harmony.apache.org by Mark Hindess <ma...@googlemail.com> on 2006/06/21 10:31:52 UTC
Re: svn commit: r415681 - in /incubator/harmony/enhanced/classlib/trunk/modules/auth: build.xml make/build.xml make/common/ make/hyproperties.xml
On 21 June 2006 at 10:35, "Stepan Mishura" <st...@gmail.com> wrote:
>
> Hi Mark,
>
> I believe that 'move' means copying file with its revisions history. This
> can be done by 'svn move'. You did this for 'hyproperties.xml' file but not
> for 'build.xml' file. Why? Yes, it is possible to figure out from its
> initial revision (415681) what was the origin. But I prefer to have unbroken
> revisions history.
I probably should have provided more information on the commit message.
Sorry.
The "move" (as discussed on the "Simplifying..." thread) actually took
all but a few lines of _both_:
make/common/build.xml, and
make/common/build.xml
I don't believe there is a way to keep the history of both and keeping
history of just one would probably have been equally confusing.
Happy to take suggestions on what you think I should have done.
Regards,
Mark.
> -----Original Message-----
> From: hindessm@apache.org [mailto:hindessm@apache.org]
> Sent: Tuesday, June 20, 2006 9:52 PM
> To: harmony-commits@incubator.apache.org
> Subject: svn commit: r415681 - in
> /incubator/harmony/enhanced/classlib/trunk/modules/auth:
> build.xmlmake/build.xml make/common/ make/hyproperties.xml
>
> Author: hindessm
> Date: Tue Jun 20 07:52:28 2006
> New Revision: 415681
>
> URL: http://svn.apache.org/viewvc?rev=415681&view=rev
> Log:
> Move auth build.xml up one level.
>
> Added:
> incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
>
> incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
> - copied unchanged from r415565,
> incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperti
> es.xml
> Removed:
> incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
> incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/
>
> Added: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
> URL:
> http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/module
> s/auth/build.xml?rev=415681&view=auto
> =============================================================================
> =
> --- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (added)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Tue Jun
> 20 07:52:28 2006
> @@ -0,0 +1,180 @@
> +<?xml version="1.0" encoding="ISO-8859-1"?>
> +
> +<!--
> + Copyright 2006 The Apache Software Foundation or its
> + licensors, as applicable.
> +
> + Licensed under the Apache License, Version 2.0 (the "License");
> + you may not use this file except in compliance with the License.
> + You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> + Unless required by applicable law or agreed to in writing, software
> + distributed under the License is distributed on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.
> + See the License for the specific language governing permissions and
> + limitations under the License.
> +-->
> +
> +<project name="AUTH Build" default="build" basedir=".">
> + <description>Build for AUTH component</description>
> +
> + <!-- import common properties -->
> + <import file="${basedir}/../../make/properties.xml" />
> +
> + <!-- set global properties for this build. -->
> + <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
> +
> + <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
> + use the Eclipse Java compiler. -->
> + <property name="build.compiler" value="modern" />
> +
> + <property file="../../make/depends.properties" />
> +
> + <property name="hy.auth.src.main.java.platform"
> + value="${hy.auth.src.main.java}/../${hy.os}" />
> +
> + <property name="hy.auth.src.test.java.platform"
> + value="${hy.auth.src.test.java}/../${hy.os}" />
> +
> + <target name="build" depends="compile.java, build.jar" />
> +
> + <target name="test" depends="build, compile.tests, run.tests" />
> +
> + <target name="clean">
> + <delete failonerror="false">
> + <fileset dir="${hy.build}"
> + includesfile="${hy.auth}/make/patternset.txt" />
> + <fileset dir="${hy.auth.bin.test}" />
> + </delete>
> + </target>
> +
> + <target name="compile.java">
> + <echo message="Compiling AUTH classes" />
> +
> + <mkdir dir="${hy.build}" />
> +
> + <javac sourcepath=""
> + destdir="${hy.build}"
> + source="${hy.javac.source}"
> + target="${hy.javac.target}"
> + debug="${hy.javac.debug}">
> +
> + <src>
> + <pathelement location="${hy.auth.src.main.java}"/>
> + <pathelement location="${hy.auth.src.main.java.platform}"
> />
> + </src>
> +
> + <bootclasspath>
> + <fileset dir="${hy.jdk}/jre/lib/boot">
> + <include name="**/*.jar" />
> + </fileset>
> + </bootclasspath>
> + </javac>
> + </target>
> +
> + <target name="build.jar">
> + <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname
> }.jar"
> + manifest="${hy.auth}/META-INF/MANIFEST.MF">
> + <fileset dir="${hy.build}"
> + includesfile="${hy.auth}/make/patternset.txt" />
> + </jar>
> + </target>
> +
> + <target name="compile.tests">
> + <echo message="Compiling AUTH tests" />
> +
> + <mkdir dir="${hy.auth.bin.test}" />
> +
> + <javac destdir="${hy.auth.bin.test}"
> + source="${hy.javac.source}"
> + target="${hy.javac.target}"
> + debug="${hy.javac.debug}">
> +
> + <!-- FIXME: AUTH tests should not reach into security module
> code -->
> + <src>
> + <pathelement location="${hy.auth.src.test.java}"/>
> + <pathelement location="${hy.auth.src.test.java.platform}"/>
> + <pathelement location="${hy.auth
> }/../security/src/test/support/common/java"/>
> + </src>
> +
> + <include name="javax/security/auth/**/*Test*.java" />
> + <include name="javax/security/sasl/**/*Test*.java" />
> + <include name="org/ietf/jgss/*Test.java" />
> + <include name="org/apache/harmony/auth/**/*Test.java" />
> + <include name="org/apache/harmony/security/test/*.java" />
> + <include
> name="tests/api/javax/security/auth/x500/X500PrincipalTest.java" />
> +
> + <bootclasspath>
> + <fileset dir="${hy.jdk}/jre/lib/boot">
> + <include name="**/*.jar" />
> + </fileset>
> + </bootclasspath>
> + </javac>
> + </target>
> +
> + <target name="run.tests">
> +
> + <mkdir dir="${hy.tests.reports}" />
> +
> + <property name="test.jre.home" value="${hy.jdk}/jre" />
> +
> + <junit fork="yes"
> + forkmode="once"
> + printsummary="withOutAndErr"
> + errorproperty="test.errors"
> + failureproperty="test.failures"
> + showoutput="on"
> + dir="${hy.auth.bin.test}"
> + jvm="${test.jre.home}/bin/java">
> +
> + <!--jvmarg value="-showversion"/-->
> +
> + <!-- Required for running the serialization unit tests -->
> + <!-- Note: will be deleted after improving -->
> + <!-- SerializationTest support class: all resource -->
> + <!-- files will be placed on the classpath -->
> + <jvmarg value="-DRESOURCE_DIR=${hy.auth.src.test.java}"/>
> +
> + <!-- to pick up junit.jar -->
> + <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${
> path.separator}../../../../${junit.jar}"/>
> +
> + <env key="JAVA_HOME" value="${test.jre.home}"/>
> +
> + <formatter type="xml" />
> +
> + <test name="${test.case}" todir="${hy.tests.reports}"
> + if="test.case" />
> +
> + <batchtest todir="${hy.tests.reports}" haltonfailure="no"
> + unless="test.case">
> +
> + <fileset dir="${hy.auth.src.test.java.platform}">
> + <include name="**/*Test.java"/>
> + </fileset>
> + <fileset dir="${hy.auth.src.test.java}">
> + <include name="**/*Test.java"/>
> +
> + <!-- Not a test -->
> + <exclude
> name="org/apache/harmony/auth/internal/SecurityTest.java"/>
> + </fileset>
> + </batchtest>
> + </junit>
> + <antcall target="touch-failures-file" />
> + <antcall target="touch-errors-file" />
> + </target>
> +
> + <target name="touch-failures-file" if="test.failures">
> + <echo file="${hy.tests.reports}/test.failures"
> + append="true" >auth
> +</echo>
> + </target>
> +
> + <target name="touch-errors-file" if="test.errors">
> + <echo file="${hy.tests.reports}/test.errors"
> + append="true" >auth
> +</echo>
> + </target>
> +
> +</project>
>
>
> --
> Thanks,
> Stepan Mishura
> Intel Middleware Products Division
>
> ------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
> ------=_Part_188251_17137871.1150860955494--
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org
Re: svn commit: r415681 - in /incubator/harmony/enhanced/classlib/trunk/modules/auth: build.xml make/build.xml make/common/ make/hyproperties.xml
Posted by Stepan Mishura <st...@gmail.com>.
On 6/21/06, Mark Hindess wrote:
>
>
> On 21 June 2006 at 10:35, "Stepan Mishura" wrote:
> >
> > Hi Mark,
> >
> > I believe that 'move' means copying file with its revisions history.
> This
> > can be done by 'svn move'. You did this for 'hyproperties.xml' file but
> not
> > for 'build.xml' file. Why? Yes, it is possible to figure out from its
> > initial revision (415681) what was the origin. But I prefer to have
> unbroken
> > revisions history.
>
> I probably should have provided more information on the commit message.
> Sorry.
>
> The "move" (as discussed on the "Simplifying..." thread) actually took
> all but a few lines of _both_:
>
> make/common/build.xml, and
> make/common/build.xml
Did you mean
make/common/build.xml, and
make/build.xml
I don't believe there is a way to keep the history of both and keeping
> history of just one would probably have been equally confusing.
Yes, you are right there is no such way. But I expected that
make/common/build.xml would be the origin for module's build.xml.
> Happy to take suggestions on what you think I should have done.
May be I missed something in the "Simplifying..." thread so I expected to
see something like:
'svn move make/common/build.xml build.xml' + some edits in moved build.xml
IMHO, it makes easer to track what was changed.
Thanks,
Stepan.
Regards,
> Mark.
>
> <SNIP>
>
------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org