8000 Merged "develop" branch · githubcs/orientdb@1719a33 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1719a33

Browse files
lvcalvca
committed
Merged "develop" branch
2 parents d634c4f + 29716bd commit 1719a33

File tree

775 files changed

+39997
-50188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

775 files changed

+39997
-50188
lines changed

‎_base/base-build.xml

Lines changed: 73 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,90 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!-- Copyright (c) 1999-2010 Luca Garulli - LICENSE: Apache 2.0 -->
33
<project basedir=".">
4-
<property name="project.src" value="src/main/java" />
5-
<property name="project.src2" value="${project.src}" />
6-
<property name="project.res" value="src/main/resources" />
7-
<property name="project.lib" value="lib" />
8-
<property name="project.lib2" value="${project.lib}" />
9-
<property name="project.doc" value="doc" />
10-
<property name="project.build" value="target/classes" />
11-
<property name="project.dist" value="target" />
12-
<property name="project.is-debug" value="true" />
13-
<property name="project.debug-level" value="lines,vars,source" />
14-
<property name="project.target-comp" value="1.6" />
15-
<property name="project.source-comp" value="1.6" />
16-
<property name="build.sysclasspath" value="ignore" />
4+
<property name="project.src" value="src/main/java"/>
5+
<property name="project.src2" value="${project.src}"/>
6+
<property name="project.res" value="src/main/resources"/>
7+
<property name="project.lib" value="lib"/>
8+
<property name="project.lib2" value="${project.lib}"/>
9+
<property name="project.doc" value="doc"/>
10+
<property name="project.build" value="target/classes"/>
11+
<property name="project.dist" value="target"/>
12+
<property name="project.is-debug" value="true"/>
13+
<property name="project.debug-level" value="lines,vars,source"/>
14+
<property name="project.target-comp" value="1.6"/>
15+
<property name="project.source-comp" value="1.6"/>
16+
<property name="build.sysclasspath" value="ignore"/>
1717

18-
<path id="project.classpath">
19-
<filelist dir=".." files="${project.jar-deps}" />
20-
<fileset dir="${project.lib}" includes="**/*.jar" />
21-
<fileset dir="${project.lib2}" includes="**/*.jar" />
22-
<fileset dir=".." includes="**/target/*.jar" />
23-
</path>
18+
<path id="project.classpath">
19+
<filelist dir=".." files="${project.jar-deps}"/>
20+
<fileset dir="${project.lib}" includes="**/*.jar"/>
21+
<fileset dir="${project.lib2}" includes="**/*.jar"/>
22+
<fileset dir=".." includes="**/target/*.jar"/>
23+
</path>
2424

25-
<target name="init">
26-
<echo>-----------------------------------</echo>
27-
<echo>-> ${ant.project.name}</echo>
28-
<echo>-----------------------------------</echo>
29-
<mkdir dir="${project.build}" />
30-
</target>
25+
<target name="init">
26+
<echo>-----------------------------------</echo>
27+
<echo>-> ${ant.project.name}</echo>
28+
<echo>-----------------------------------</echo>
29+
<mkdir dir="${project.build}"/>
30+
</target>
3131

32-
<target name="clean">
33-
<delete dir="${project.build}" />
34-
<delete dir="${project.dist}" />
35-
</target>
32+
<target name="clean">
33+
<delete dir="${project.build}"/>
34+
<delete dir="${project.dist}"/>
35+
</target>
3636

37-
<target name="compile" depends="init">
38-
<mkdir dir="${project.lib}" />
39-
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}" target="${project.target-comp}" source="${project.source-comp}" verbose="false" includeAntRuntime="false">
40-
<src path="${project.src}" />
41-
<src path="${project.src2}" />
42-
<classpath refid="project.classpath" />
43-
</javac>
37+
<target name="compile" depends="init">
38+
<mkdir dir="${project.lib}"/>
39+
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}"
40+
target="${project.target-comp}" source="${project.source-comp}" verbose="false"
41+
includeAntRuntime="false">
42+
<src path="${project.src}"/>
43+
<src path="${project.src2}"/>
44+
<classpath refid="project.classpath"/>
45+
</javac>
4446
<!--<copydir dest="${web.dir}/${deploy.name}" src="${src.web.dir}">
4547
<include name="**/*" />
4648
</copydir> -->
47-
49+
4850
<copy todir="${project.build}">
49-
<fileset dir="${project.res}">
51+
<fileset dir="${project.res}">
5052
<include name="**/*"/>
51-
</fileset>
52-
</copy>
53-
</target>
53+
</fileset>
54+
</copy>
55+
</target>
5456

55-
<target name="jar" depends="compile">
56-
<mkdir dir="${project.dist}" />
57-
<delete file="${project.dist}/${project.dist}/${ant.project.name}-${version}.jar" />
58-
<jar compress="true" basedir="${project.build}" destfile="${project.dist}/${ant.project.name}-${version}.jar">
59-
<manifest>
60-
<attribute name="Implementation-Vendor" value="${vendor}" />
61-
<attribute name="Implementation-Title" value="${product}" />
62-
<attribute name="Implementation-Version" value="${version}" />
63-
<attribute name="Main-Class" value="${project.jar-mainclass}" />
64-
<attribute name="Class-Path" value="${project.jar-classpath}" />
65-
</manifest>
66-
</jar>
67-
<copy todir="${project.dist}">
68-
<fileset dir="${project.lib}" includes="*.jar" excludes="test*.jar" />
69-
</copy>
70-
</target>
57+
<target name="jar" depends="compile">
58+
<mkdir dir="${project.dist}"/>
59+
<delete file="${project.dist}/${project.dist}/${ant.project.name}-${version}.jar"/>
60+
<jar compress="true" basedir="${project.build}" destfile="${project.dist}/${ant.project.name}-${version}.jar">
61+
<manifest>
62+
< B41A /span><attribute name="Implementation-Vendor" value="${vendor}"/>
63+
<attribute name="Implementation-Title" value="${product}"/>
64+
<attribute name="Implementation-Version" value="${version}"/>
65+
<attribute name="Main-Class" value="${project.jar-mainclass}"/>
66+
<attribute name="Class-Path" value="${project.jar-classpath}"/>
67+
</manifest>
68+
</jar>
69+
<copy todir="${project.dist}">
70+
<fileset dir="${project.lib}" includes="*.jar" excludes="test*.jar"/>
71+
</copy>
72+
</target>
7173

72-
<target name="install" depends="jar">
73-
<copy todir="${global.lib}">
74-
<fileset dir="${project.dist}" includes="*.jar">
75-
<exclude name="*test*.jar" />
76-
<exclude name="*-javadoc.jar" />
77-
<exclude name="*-sources.jar" />
78-
</fileset>
79-
</copy>
80-
</target>
74+
<target name="install" depends="jar">
75+
<copy todir="${global.lib}">
76+
<fileset dir="${project.dist}" includes="*.jar">
77+
<exclude name="*test*.jar"/>
78+
<exclude name="*-javadoc.jar"/>
79+
<exclude name="*-sources.jar"/>
80+
</fileset>
81+
</copy>
82+
</target>
8183

82-
<target name="install-zip">
83-
<mkdir dir="${project.dist}" />
84-
<delete file="${project.dist}/${ant.project.name}.zip" />
85-
<zip destfile="${project.dist}/${ant.project.name}.zip" basedir="." excludes="**.svn/" />
86-
</target>
84+
<target name="install-zip">
85+
<mkdir dir="${project.dist}"/>
86+
<delete file="${project.dist}/${ant.project.name}.zip"/>
87+
<zip destfile="${project.dist}/${ant.project.name}.zip" basedir="." excludes="**.svn/"/>
88+
</target>
8789

8890
</project>

0 commit comments

Comments
 (0)
0