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

Commitef8181b

Browse files
author
Peter Mount
committed
Hmmm, a conflict with V1.104 of configure.in remained and broke configure
(said redirection required when run).After checking using cvsweb, removed the offending conflict.Rebuilt configure using autoconf, and it now works fine.
1 parent79e2dd5 commitef8181b

File tree

4 files changed

+12
-35
lines changed

4 files changed

+12
-35
lines changed

‎configure‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
# ... more stuff removed ...
4444

45-
# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/0509:38:55 peter Exp $
45+
# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/0510:18:43 peter Exp $
4646

4747

4848
# PGAC_PATH_FLEX
@@ -66,7 +66,7 @@
6666
#
6767
# Autoconf macros for configuring the build of Python extension modules
6868
#
69-
# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/0509:38:55 peter Exp $
69+
# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/0510:18:43 peter Exp $
7070
#
7171

7272
# PGAC_PROG_PYTHON
@@ -85,7 +85,7 @@
8585
# the build of the shared module. Future project.
8686
# PGAC_PATH_PYTHONDIR
8787

88-
# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/0509:38:55 peter Exp $
88+
# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/0510:18:43 peter Exp $
8989

9090
# Autoconf macros to check for Tcl related things
9191

@@ -8085,26 +8085,13 @@ done
80858085

80868086
fi
80878087

8088-
<<<<<<< configure.in
8089-
8090-
# Finally ready to produce output files ...
8091-
=======
8092-
80938088
# check whether 'test -ef' works
80948089
if (test"$srcdir" -ef"$srcdir")>/dev/null2>&1;then
80958090
test_ef_works=yes
80968091
else
80978092
test_ef_works=no
80988093
fi
8099-
>>>>>>> 1.104
81008094

8101-
<<<<<<< configure.in
8102-
iftest x"$abs_top_srcdir"!= x"$abs_top_builddir";then
8103-
echo$ac_n"preparing build tree...$ac_c"1>&6
8104-
/bin/sh"$srcdir/config/prep_buildtree""$abs_top_srcdir""$abs_top_builddir" \
8105-
|| {echo"configure: error: failed"1>&2;exit 1; }
8106-
echo"$ac_t""done"1>&6
8107-
=======
81088095
abs_top_srcdir=
81098096

81108097

@@ -8117,7 +8104,6 @@ if test "$test_ef_works" = yes ; then
81178104
|| {echo"configure: error: failed"1>&2;exit 1; }
81188105
echo"$ac_t""done"1>&6
81198106
fi
8120-
>>>>>>> 1.104
81218107
fi
81228108

81238109
trap'' 1 2 15

‎configure.in‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,26 +1145,13 @@ if test -n "$NSGMLS"; then
11451145
AC_CHECK_PROGS(SGMLSPL, sgmlspl)
11461146
fi
11471147

1148-
<<<<<<< configure.in
1149-
1150-
# Finally ready to produce output files ...
1151-
=======
1152-
11531148
# check whether 'test -ef' works
11541149
if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
11551150
test_ef_works=yes
11561151
else
11571152
test_ef_works=no
11581153
fi
1159-
>>>>>>> 1.104
1160-
1161-
<<<<<<< configure.in
1162-
if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
1163-
echo $ac_n "preparing build tree... $ac_c" 1>&6
1164-
/bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \
1165-
|| AC_MSG_ERROR(failed)
1166-
AC_MSG_RESULT(done)
1167-
=======
1154+
11681155
abs_top_srcdir=
11691156
AC_SUBST(abs_top_srcdir)
11701157

@@ -1177,7 +1164,6 @@ if test "$test_ef_works" = yes ; then
11771164
|| AC_MSG_ERROR(failed)
11781165
AC_MSG_RESULT(done)
11791166
fi
1180-
>>>>>>> 1.104
11811167
fi
11821168

11831169
AC_OUTPUT(

‎contrib/retep/retep.jpx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<propertycategory="sys"name="Version"value="1.0" />
4141
<propertycategory="sys"name="VersionLabel"value="@version" />
4242
<propertycategory="sys"name="WorkingDirectory"value="." />
43-
<nodetype="Package"name="uk.org.retep.app" />
4443
<nodetype="Package"name="uk.org.retep.dtu" />
4544
<nodetype="Package"name="uk.org.retep.tools" />
4645
<nodetype="Package"name="uk.org.retep.util" />

‎contrib/retep/uk/org/retep/util/StandaloneApp.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Note: Because it's designed for standalone use, if this window is closed,
1616
* the JVM is terminated. Do not use for normal application use.
1717
*
18-
* $Id: StandaloneApp.java,v 1.1 2001/03/0509:15:36 peter Exp $
18+
* $Id: StandaloneApp.java,v 1.2 2001/03/0510:18:48 peter Exp $
1919
*
2020
* @author
2121
* @version 1.0
@@ -44,7 +44,13 @@ public void windowClosing(WindowEvent e)
4444
Globals.getInstance().parseArguments(aArgs);
4545

4646
// Now initialise this tool (init is overidden)
47-
JComponenttool =init();
47+
JComponenttool =null;
48+
try {
49+
tool =init();
50+
}catch(Exceptionex) {
51+
ex.printStackTrace();
52+
System.exit(1);
53+
}
4854

4955
// Now add to this frame
5056
this.getContentPane().add(tool,BorderLayout.CENTER);

0 commit comments

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