Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaf3ce5d

Browse files
committed
Resolve a number of oddities in the Java build. First, remove the weird
redirections between the build files, which didn't work completely. Nowyou just go to the directory of your choice and run make. Clean up thebuild files to have a logical order, fix the unnecessary rebuilds, preventthe deleting targets from removing files they're not responsible for. Ant1.3 does not have a bug. It deletes directories just fine if you followthe documentation.
1 parent55432fe commitaf3ce5d

File tree

6 files changed

+205
-225
lines changed

6 files changed

+205
-225
lines changed

‎build.xml

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎contrib/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.22 2001/06/18 17:20:56 momjian Exp $
1+
# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.23 2001/07/06 23:07:19 petere Exp $
22

33
subdir = contrib
44
top_builddir = ..
@@ -38,6 +38,11 @@ WANTED_DIRS = \
3838
userlock\
3939
vacuumlo
4040

41+
ifeq ($(with_java),yes)
42+
WANTED_DIRS += retep
43+
endif
44+
45+
4146
allinstallinstalldirsuninstallcleandistcleanmaintainer-clean:
4247
fordirin$(WANTED_DIRS);do \
4348
if [-f$$dir/Makefile ];then \

‎contrib/retep/Makefile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile for contributed retep tools
4+
#
5+
# Copyright (c) 2001, PostgreSQL Global Development Group
6+
#
7+
# $Header: /cvsroot/pgsql/contrib/retep/Attic/Makefile,v 1.1 2001/07/06 23:07:20 petere Exp $
8+
#
9+
#-------------------------------------------------------------------------
10+
11+
subdir = contrib/retep
12+
top_builddir = ../..
13+
include$(top_builddir)/src/Makefile.global
14+
15+
all:
16+
$(ANT) -buildfile$(srcdir)/build.xml all
17+
18+
install: installdirs
19+
$(ANT) -buildfile$(srcdir)/build.xml install\
20+
-Dinstall.directory=$(javadir)
21+
22+
installdirs:
23+
$(mkinstalldirs)$(javadir)
24+
25+
uninstall:
26+
$(ANT) -buildfile$(srcdir)/build.xml uninstall\
27+
-Dinstall.directory=$(javadir)
28+
29+
cleandistcleanmaintainer-clean:
30+
$(ANT) -buildfile$(srcdir)/build.xml clean

‎contrib/retep/build.xml

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1+
<?xml version="1.0"?>
12
<!--
23
34
build file to build the donated retep tools packages
45
5-
$Id:build.xml,v 1.7 2001/05/17 03:22:53 momjian Exp $
6+
$Header: /cvsroot/pgsql/contrib/retep/Attic/build.xml,v 1.8 2001/07/06 23:07:20 petere Exp $
67
78
-->
89

9-
<projectname="retep"default="jar"basedir=".">
10+
<!DOCTYPEproject [
11+
<!ENTITYjarname"retepTools.jar">
12+
]>
13+
14+
<projectname="retep"default="all"basedir=".">
1015

1116
<!-- set global properties for this build-->
12-
<propertyname="src"value="." />
13-
<propertyname="dest"value="build" />
17+
<propertyname="srcdir"value="." />
18+
<propertyname="builddir"value="build" />
1419
<propertyname="package"value="uk/org/retep" />
15-
<propertyname="jars"value="jars" />
20+
<propertyname="jardir"value="jars" />
1621

1722
<!-- Some checks used to build dependent on the environment-->
1823
<targetname="checks">
@@ -23,53 +28,71 @@
2328
</target>
2429

2530
<targetname="warning"depends="checks"unless="jdk1.2+">
26-
<echomessage="WARNING -- contributed retep tools need jdk1.2 or later -- compilation NOT done." />
31+
<echo>
32+
*** WARNING: Contributed retep tools need jdk1.2 or later.
33+
*** Compilation NOT done
34+
</echo>
2735
</target>
2836

2937

30-
<!-- Prepares the build by creating a directory to place the class files-->
31-
<targetname="prepare">
32-
<mkdirdir="${dest}" />
33-
<mkdirdir="${jars}" />
38+
<!-- default target-->
39+
<targetname="all">
40+
<antcalltarget="jar" />
3441
</target>
3542

36-
<!-- This target removes any class files from the build directory-->
37-
<targetname="clean">
38-
<delete>
39-
<filesetdir="${dest}" />
40-
<filesetdir="${jars}" />
41-
</delete>
42-
</target>
43+
44+
<!-- Builds the various jar files-->
45+
<targetname="jar"depends="compile">
46+
<jarjarfile="${jardir}/&jarname;"whenempty="fail">
47+
<filesetdir="${builddir}">
48+
<includename="**/*.class" />
49+
</fileset>
50+
51+
<filesetdir="${srcdir}">
52+
<includename="**/*.properties" />
53+
</fileset>
54+
</jar>
55+
</target>
56+
4357

4458
<!-- Builds the XML Tools-->
4559
<targetname="compile"depends="checks,prepare,warning"if="jdk1.2+">
46-
<javacsrcdir="${src}"destdir="${dest}">
60+
<javacsrcdir="${srcdir}"destdir="${builddir}">
4761
<includename="${package}/**" />
4862
<excludename="${package}/**"unless="jdk1.2+" />
4963
</javac>
5064
</target>
5165

52-
<!-- Builds the various jar files-->
53-
<targetname="jar"depends="compile">
54-
<jarjarfile="${jars}/retepTools.jar"basedir="${dest}">
55-
<includename="${package}/**" />
56-
</jar>
66+
67+
<!-- Prepares the build by creating a directory to place the class files-->
68+
<targetname="prepare">
69+
<mkdirdir="${builddir}" />
70+
<mkdirdir="${jardir}" />
5771
</target>
5872

59-
<targetname="install"depends="jar"if="install.directory">
73+
74+
<targetname="install"depends="all"if="install.directory">
6075
<copytodir="${install.directory}"overwrite="true"filtering="off">
61-
<filesetdir="${jars}">
62-
<includename="**/*.jar" />
76+
<filesetdir="${jardir}">
77+
<includename="&jarname;" />
6378
</fileset>
6479
</copy>
6580
</target>
6681

82+
6783
<targetname="uninstall"if="install.directory">
6884
<delete>
6985
<filesetdir="${install.directory}">
70-
<includename="**/*.jar" />
86+
<includename="&jarname;" />
7187
</fileset>
7288
</delete>
7389
</target>
7490

91+
92+
<!-- This target removes any class files from the build directory-->
93+
<targetname="clean">
94+
<deletequiet="true"dir="${builddir}" />
95+
<deletequiet="true"dir="${jardir}" />
96+
</target>
97+
7598
</project>

‎src/interfaces/jdbc/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile forsrc/interfaces
3+
# Makefile forJDBC driver
44
#
5-
# Copyright (c)1994, Regents of the University of California
5+
# Copyright (c)2001, PostgreSQL Global Development Group
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.32 2001/06/07 20:24:54 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.33 2001/07/06 23:07:20 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,22 +20,22 @@ properties := -Dmajor=$(majorversion) -Dminor=$(minorversion) \
2020
-Ddef_pgport=$(DEF_PGPORT)
2121

2222
all:
23-
$(ANT) -buildfile$(top_srcdir)/build.xml$(properties)
23+
$(ANT) -buildfile$(srcdir)/build.xml all\
24+
$(properties)
2425

2526
install: installdirs
26-
$(ANT) -Dinstall.directory=$(javadir)\
27-
-buildfile$(top_srcdir)/build.xml\
28-
install$(properties)
27+
$(ANT) -buildfile$(srcdir)/build.xml install\
28+
-Dinstall.directory=$(javadir)$(properties)
2929

3030
installdirs:
31-
$(mkinstalldirs)$(DESTDIR)$(datadir)/java
31+
$(mkinstalldirs)$(javadir)
3232

3333
uninstall:
34-
$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java\
35-
-buildfile$(top_srcdir)/build.xml\
36-
uninstall
34+
$(ANT) -buildfile$(srcdir)/build.xml uninstall\
35+
-Dinstall.directory=$(javadir)
3736

3837
cleandistcleanmaintainer-clean:
39-
$(ANT) -buildfile$(top_srcdir)/build.xml clean
40-
# ANT 1.3 has a bug that prevents directory deletion
41-
rm -rf build jars
38+
$(ANT) -buildfile$(srcdir)/build.xml clean
39+
40+
check:
41+
$(ANT) -buildfile$(srcdir)/build.xmltest

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp