annotate build-aux/diff-template @ 12733:b67c2d580a25 stable

maint: clean up top-level directory * build-aux/bootstrap: Rename from bootstrap. * build-aux/bootstrap.conf: Rename from bootstrap.conf. * build-aux/changelog.tmpl: Rename from changelog.tmpl. * build-aux/bootstrap.conf: Update for new file locations. * build-aux/common.mk: Rename from common.mk. * build-aux/diff-template: Rename from diff-template. * build-aux/mk-opts.pl: Rename from mk-opts.pl. * build-aux/mkinstalldirs: Rename from mkinstalldirs. * build-aux/move-if-change: Rename from move-if-change. * etc/CHECKLIST: Rename from CHECKLIST. * etc/HACKING: Rename from HACKING. * etc/NEWS.1: Rename from NEWS.1. * etc/NEWS.2: Rename from NEWS.2. * etc/NEWS.3: Rename from NEWS.3. * etc/OLD-ChangeLogs/ChangeLog: Rename from OLD-ChangeLogs/ChangeLog. * etc/OLD-ChangeLogs/ChangeLog.1: Rename from OLD-ChangeLogs/ChangeLog.1. * etc/OLD-ChangeLogs/doc-ChangeLog: Rename from OLD-ChangeLogs/doc-ChangeLog. * etc/OLD-ChangeLogs/libcruft-ChangeLog: Rename from OLD-ChangeLogs/libcruft-ChangeLog. * etc/OLD-ChangeLogs/liboctave-ChangeLog: Rename from OLD-ChangeLogs/liboctave-ChangeLog. * etc/OLD-ChangeLogs/scripts-ChangeLog: Rename from OLD-ChangeLogs/scripts-ChangeLog. * etc/OLD-ChangeLogs/src-ChangeLog: Rename from OLD-ChangeLogs/src-ChangeLog. * etc/OLD-ChangeLogs/test-ChangeLog: Rename from OLD-ChangeLogs/test-ChangeLog. * etc/PROJECTS: Rename from PROJECTS. * etc/README.Cygwin: Rename from README.Cygwin. * etc/README.Linux: Rename from README.Linux. * etc/README.MacOS: Rename from README.MacOS. * etc/README.MinGW: Rename from README.MinGW. * etc/README.Windows: Rename from README.Windows. * etc/README.devel: Rename from README.devel. * etc/README.ftp: Rename from README.ftp. * etc/README.gnuplot: Rename from README.gnuplot. * etc/README.kpathsea: Rename from README.kpathsea. * etc/README.mirrors: Rename from README.mirrors. * etc/README.snapshots: Rename from README.snapshots. * etc/gdbinit: Rename from gdbinit. * m4/acinclude.m4: Rename from acinclude.m4. * src/mkoctfile.cc.in: Rename from mkoctfile.cc.in. * src/mkoctfile.in: Rename from mkoctfile.in. * src/octave-config.cc.in: Rename from octave-config.cc.in. * src/octave-config.in: Rename from octave-config.in. * config.guess, config.sub, missing, octave-sh: Delete. * Makefile.am: Include build-aux/common.mk instead of common.mk. * examples/Makefile.am, libcruft/Makefile.am, liboctave/Makefile.am, liboctave/config-ops.sh, scripts/Makefile.am, src/DLD-FUNCTIONS/config-module.sh, test/Makefile.am, autogen.sh, doc/Makefile.am, doc/faq/Makefile.am, doc/icons/Makefile.am, doc/interpreter/Makefile.am, doc/interpreter/config-images.sh, doc/liboctave/Makefile.am, doc/refcard/Makefile.am, build-aux/common.mk, src/Makefile.am: Update for new file locations. * Makefile.am: Don't build mkoctfile or octave-config here. * README: Update INSTALL info. * build-aux/mkinstalldirs: Update to new version. * src/Makefile.am (mkoctfile, octave-config): New targets.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Jun 2011 14:35:42 -0400
parents diff-template@66fdc831c580
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2335
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
1 #!/bin/sh
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
2 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
3 # To apply this patch, cd to the top level Octave source directory and
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
4 # run this file through /bin/sh. It will first remove any files that
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
5 # have been deleted from the source distribution since the last
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
6 # release and then update the sources with patch(1).
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
7 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
8 # Diffs for updating *.ps, *.dvi, and *.info* files are not included
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
9 # because they can be recreated from the Texinfo files using TeX and
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
10 # makeinfo.
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
11 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
12 # Diffs for updating parse.cc and y.tab.h are not included because
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
13 # they can be recreated from the file parse.y using bison.
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
14 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
15 # Diffs for updating lex.cc are not included because it can be
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
16 # recreated from lex.l using flex.
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
17 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
18 # Diffs for updating the configure script are not included because
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
19 # it can be recreated from configure.in using autoconf.
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
20 #
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
21 # John W. Eaton
9322
66fdc831c580 fix jwe email address
John W. Eaton <jwe@octave.org>
parents: 2335
diff changeset
22 # jwe@octave.org
2335
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
23
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
24 if test -f src/octave.cc ; then
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
25 true
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
26 else
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
27 echo '***********************************************************' 1>&2
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
28 echo 'You must run this script in the top-level octave directory!' 1>&2
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
29 echo '***********************************************************' 1>&2
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
30 exit 1
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
31 fi
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
32
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
33 echo 'removing the bsd-math directory'
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
34 rm -rf bsd-math
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
35
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
36 echo 'creating libcruft/slatec-fn directory'
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
37 mkdir libcruft/slatec-fn
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
38
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
39 echo 'removing old test files'
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
40 rm -f test/octave.test/index.exp
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
41 rm -f test/octave.test/prefer.exp
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
42 rm -f test/octave.test/zero-one.exp
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
43
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
44 echo 'creating directories for new test files'
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
45 mkdir test/octave.test/index/dfi-f
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
46 mkdir test/octave.test/index/dfi-t
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
47 mkdir test/octave.test/prefer
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
48 mkdir test/octave.test/zero-one/fff
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
49 mkdir test/octave.test/zero-one/fft
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
50 mkdir test/octave.test/zero-one/ftf
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
51 mkdir test/octave.test/zero-one/tff
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
52 mkdir test/octave.test/zero-one/ftt
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
53 mkdir test/octave.test/zero-one/tft
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
54 mkdir test/octave.test/zero-one/ttf
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
55 mkdir test/octave.test/zero-one/ttt
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
56
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
57 echo 'patching existing files'
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
58 patch -p1 << \PATCH_EOF
4a9feb849125 [project @ 1996-07-19 02:51:02 by jwe]
jwe
parents:
diff changeset
59 PATCH_EOF