changeset 51:d8661b24ed37

extracting runtime-util.jar
author Pavel.Sher
date Thu, 09 Oct 2008 18:29:26 +0400
parents d4b7dcc8d66e
children 4199d7e08d6e
files build.xml lib/common-api.jar lib/runtime-util.jar mercurial.ipr mercurial.properties mercurial.xml
diffstat 6 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/build.xml	Thu Oct 09 13:12:32 2008 +0400
+++ b/build.xml	Thu Oct 09 18:29:26 2008 +0400
@@ -31,11 +31,16 @@
 
   <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${basedir}/mercurial-tests/lib/testng-5.7-jdk15.jar"/>
 
+  <path id="tests_classpath">
+    <pathelement location="${agent.home.dir}/lib/buildServerRuntimeUtil.jar"/>
+    <path refid="mercurial-tests.runtime.module.classpath"/>
+  </path>
+
   <target name="run-tests" depends="clean, init, compile.module.mercurial-tests.production">
     <property name="suspend" value="n"/>
 
     <testng haltonfailure="no" failureProperty="failure_found" listener="org.testng.reporters.TestHTMLReporter"
-            outputdir="${basedir}/test-output" classpathref="mercurial-tests.runtime.module.classpath" dumpcommand="true">
+            outputdir="${basedir}/test-output" classpathref="tests_classpath" dumpcommand="true">
 
       <jvmarg value="-ea"/>
       <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=5555"/>
Binary file lib/common-api.jar has changed
Binary file lib/runtime-util.jar has changed
--- a/mercurial.ipr	Thu Oct 09 13:12:32 2008 +0400
+++ b/mercurial.ipr	Thu Oct 09 18:29:26 2008 +0400
@@ -453,6 +453,7 @@
     <library name="TeamCityAPI-common">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/lib/common-api.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/runtime-util.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
--- a/mercurial.properties	Thu Oct 09 13:12:32 2008 +0400
+++ b/mercurial.properties	Thu Oct 09 18:29:26 2008 +0400
@@ -1,1 +1,2 @@
-path.variable.ant_home=C:/Tools/apache-ant-1.6.5
\ No newline at end of file
+path.variable.ant_home=C\:/Tools/apache-ant-1.6.5
+path.variable.template=C\:/Work/tmp/juxy
\ No newline at end of file
--- a/mercurial.xml	Thu Oct 09 13:12:32 2008 +0400
+++ b/mercurial.xml	Thu Oct 09 18:29:26 2008 +0400
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="mercurial" default="all">
   
   
@@ -27,6 +27,9 @@
     <exclude name="**/.IJI.*/**"/>
     <exclude name="**/.pyc/**"/>
     <exclude name="**/.pyo/**"/>
+    <exclude name="**/*.pyc/**"/>
+    <exclude name="**/*.pyo/**"/>
+    <exclude name="**/.git/**"/>
   </patternset>
   <patternset id="compiler.resources">
     <include name="**/?*.properties"/>
@@ -86,6 +89,7 @@
   
   <path id="library.teamcityapi-common.classpath">
     <pathelement location="${basedir}/lib/common-api.jar"/>
+    <pathelement location="${basedir}/lib/runtime-util.jar"/>
   </path>
   
   <path id="library.teamcityapi-agent.classpath">
@@ -234,9 +238,7 @@
   <path id="mercurial-agent.runtime.module.classpath">
     <pathelement location="${mercurial-agent.output.dir}"/>
     <path refid="library.teamcityapi-agent.classpath"/>
-    <pathelement location="${mercurial-common.output.dir}"/>
-    <path refid="library.teamcityapi-common.classpath"/>
-    <path refid="library.idea-openapi.classpath"/>
+    <path refid="mercurial-common.runtime.module.classpath"/>
   </path>
   
   
@@ -315,8 +317,7 @@
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
-    <pathelement location="${mercurial-common.output.dir}"/>
-    <path refid="library.teamcityapi-common.classpath"/>
+    <path refid="mercurial-common.runtime.module.classpath"/>
   </path>
   
   
@@ -390,31 +391,25 @@
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
-    <path refid="library.teamcityapi-common.classpath"/>
     <path refid="library.teamcity-testssupport.classpath"/>
     <path refid="library.junit.classpath"/>
     <path refid="library.testng.classpath"/>
     <path refid="library.jmock.classpath"/>
+    <path refid="library.teamcityapi-common.classpath"/>
     <pathelement location="${mercurial-common.output.dir}"/>
     <pathelement location="${mercurial-agent.output.dir}"/>
   </path>
   
   <path id="mercurial-tests.runtime.module.classpath">
     <pathelement location="${mercurial-tests.output.dir}"/>
-    <pathelement location="${mercurial-server.output.dir}"/>
-    <path refid="library.teamcityapi-server.classpath"/>
-    <path refid="library.idea-openapi.classpath"/>
-    <path refid="library.teamcity-impl.classpath"/>
-    <path refid="library.log4j.classpath"/>
-    <path refid="library.gnu_trove.classpath"/>
-    <pathelement location="${mercurial-common.output.dir}"/>
-    <path refid="library.teamcityapi-common.classpath"/>
+    <path refid="mercurial-server.runtime.module.classpath"/>
     <path refid="library.teamcity-testssupport.classpath"/>
     <path refid="library.junit.classpath"/>
     <path refid="library.testng.classpath"/>
     <path refid="library.jmock.classpath"/>
-    <pathelement location="${mercurial-agent.output.dir}"/>
-    <path refid="library.teamcityapi-agent.classpath"/>
+    <path refid="library.teamcityapi-common.classpath"/>
+    <path refid="mercurial-common.runtime.module.classpath"/>
+    <path refid="mercurial-agent.runtime.module.classpath"/>
   </path>