changeset 6:c05869fe20af

dist target added
author Pavel.Sher
date Mon, 14 Jul 2008 20:29:19 +0400
parents 8e6ade135483
children 06104e41d5c2
files build.xml mercurial.ipr mercurial.xml mercurial/mercurial.iml
diffstat 4 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/build.xml	Mon Jul 14 20:09:42 2008 +0400
+++ b/build.xml	Mon Jul 14 20:29:19 2008 +0400
@@ -1,8 +1,12 @@
-<project name="Mercurial VCS Support" default="dist">
+<project name="Mercurial VCS Support" default="dist" basedir=".">
   <property file="mercurial.properties"/>
   <import file="mercurial.xml"/>
 
-  <target name="dist" depends="clean, init, compile.module.mercurial">
+  <property name="distPath" value="${basedir}/dist"/>
 
+  <target name="dist" depends="clean, init, compile.module.mercurial.production">
+    <mkdir dir="${distPath}/unpacked"/>
+    <jar destfile="${distPath}/unpacked/mercurial.jar" basedir="${mercurial.output.dir}"/>
+    <zip basedir="${distPath}/unpacked" destfile="${distPath}/mercurial.zip" includes="**/*"/>
   </target>
 </project>
\ No newline at end of file
--- a/mercurial.ipr	Mon Jul 14 20:09:42 2008 +0400
+++ b/mercurial.ipr	Mon Jul 14 20:29:19 2008 +0400
@@ -63,6 +63,8 @@
       <entry name="?*.html" />
       <entry name="?*.dtd" />
       <entry name="?*.tld" />
+      <entry name="?*.jsp" />
+      <entry name="?*.tag" />
     </wildcardResourcePatterns>
   </component>
   <component name="DependenciesAnalyzeManager">
@@ -315,7 +317,7 @@
       <SplitterProportionsDataImpl />
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5.latest" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ResourceManagerContainer">
--- a/mercurial.xml	Mon Jul 14 20:09:42 2008 +0400
+++ b/mercurial.xml	Mon Jul 14 20:29:19 2008 +0400
@@ -38,6 +38,8 @@
     <include name="**/?*.html"/>
     <include name="**/?*.dtd"/>
     <include name="**/?*.tld"/>
+    <include name="**/?*.jsp"/>
+    <include name="**/?*.tag"/>
   </patternset>
   
   
@@ -180,7 +182,7 @@
   
   <path id="mercurial.module.sourcepath">
     <dirset dir="${module.mercurial.basedir}/mercurial">
-      <include name="resources/buildServerResources"/>
+      <include name="resources"/>
       <include name="src"/>
     </dirset>
   </path>
@@ -199,7 +201,7 @@
     </javac>
     
     <copy todir="${mercurial.output.dir}">
-      <fileset dir="${module.mercurial.basedir}/mercurial/resources/buildServerResources">
+      <fileset dir="${module.mercurial.basedir}/mercurial/resources">
         <patternset refid="compiler.resources"/>
         <type type="file"/>
       </fileset>
--- a/mercurial/mercurial.iml	Mon Jul 14 20:09:42 2008 +0400
+++ b/mercurial/mercurial.iml	Mon Jul 14 20:29:19 2008 +0400
@@ -15,7 +15,7 @@
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources/buildServerResources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />