Compare commits
No commits in common. "b962025fdee2e9733763900f3a426459adf62d4b" and "cc55b729539f672dbe44c8887a2c3f1c2e49e9a1" have entirely different histories.
b962025fde
...
cc55b72953
4 changed files with 10 additions and 31 deletions
|
@ -11,11 +11,16 @@
|
|||
<classpathentry kind="lib" path="lib/devinsy-utils-0.2.0.jar"/>
|
||||
<classpathentry kind="lib" path="lib/commons-codec-1.8.jar" sourcepath="lib/commons-codec-1.8-sources.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.jar" sourcepath="lib/commons-fileupload-1.3-sources.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
|
||||
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
|
||||
<attributes>
|
||||
<attribute name="owner.project.facets" value="jst.utility"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45">
|
||||
<attributes>
|
||||
<attribute name="owner.project.facets" value="java"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.jar" sourcepath="lib/commons-fileupload-1.3-sources.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<faceted-project>
|
||||
<runtime name="Apache Tomcat v7.0"/>
|
||||
<fixed facet="java"/>
|
||||
<fixed facet="jst.utility"/>
|
||||
<installed facet="java" version="1.6"/>
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<project default="buildandgit" name="sikevadb">
|
||||
<!-- -->
|
||||
<import file="buildjar.xml" />
|
||||
</project>
|
26
buildjar.xml
26
buildjar.xml
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<project default="dist" name="jarbuild">
|
||||
<!--ANT 1.7 is required -->
|
||||
<property name="buildjar.version" value="1.3" />
|
||||
<property name="buildjar.version" value="1.1" />
|
||||
<property file="build.properties" />
|
||||
<property name="build.dir" value="${basedir}/build" />
|
||||
<property name="build.src" value="${basedir}/src" />
|
||||
|
@ -124,28 +124,6 @@
|
|||
<copy todir="${dist.dir}/lib" overwrite="true">
|
||||
<fileset dir="lib" excludes="hamcrest-core*,junit*" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ***** Dist ***** -->
|
||||
<target name="buildandgit" depends="dist">
|
||||
<!-- GIT actions-->
|
||||
<echo message="Commit build.num"/>
|
||||
<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
|
||||
<arg line="commit -m 'Build ${dist.version}' build.num"/>
|
||||
</exec>
|
||||
<echo message="${git.commit.out}" />
|
||||
|
||||
<echo message="Tag"/>
|
||||
<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
|
||||
<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>
|
||||
</exec>
|
||||
<echo message="${git.tag.out}" />
|
||||
|
||||
<echo message="Push"/>
|
||||
<exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
|
||||
<arg line="push"/>
|
||||
</exec>
|
||||
<echo message="${git.push.out}" />
|
||||
</target>
|
||||
|
||||
</target>
|
||||
</project>
|
||||
|
|
Loading…
Reference in a new issue