CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/07 13:34:59
Modified files:
windows/mknetrel: split doc
windows/extra : libguilereadline-v-16.la
libguile-srfi-srfi-60-v-1.la
windows : GNUmakefile ChangeLog
Added files:
windows/patch : guile-1.7.2-3.patch guile-1.6.7-3.patch
Log message:
(auto_requires): Add auto-requires detection for
cygwin.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/patch/guile-1.7.2-3.patch?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/patch/guile-1.6.7-3.patch?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/split.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/doc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/libguilereadline-v-16.la.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/libguile-srfi-srfi-60-v-1.la.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.40 installers/windows/ChangeLog:1.41
--- installers/windows/ChangeLog:1.40 Fri Oct 7 12:01:45 2005
+++ installers/windows/ChangeLog Fri Oct 7 13:34:59 2005
@@ -1,3 +1,23 @@
+2005-10-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * mknetrel/split (auto_requires): Add auto-requires detection for
+ cygwin.
+
+2005-10-06 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * extra/guile (preinstall): More libtool fixups: install
+ relink-failure dll's manually.
+
+2005-10-03 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * mknetrel/split: Remove autom4te.cache from src package.
+
+ * mknetrel/split: Install changelog.$Cygwin in $packagedocdir.
+
+ * mknetrel/doc: Remove -BUILD from $packagedocdir.
+
+ * mknetrel/doc: gzip info files.
+
2005-10-07 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* bin/mknetrel (AM_MAKEFLAGS): deal with different File versions.
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.31 installers/windows/GNUmakefile:1.32
--- installers/windows/GNUmakefile:1.31 Sun Oct 2 15:26:13 2005
+++ installers/windows/GNUmakefile Fri Oct 7 13:34:59 2005
@@ -175,6 +175,7 @@
$(MKNETREL) $(MKNETREL_FLAGS) $*
endif
touch $@
+## HUH?
$(MAKE) short-circuit= upset
# kuch
Index: installers/windows/extra/libguile-srfi-srfi-60-v-1.la
diff -u installers/windows/extra/libguile-srfi-srfi-60-v-1.la:1.1
installers/windows/extra/libguile-srfi-srfi-60-v-1.la:1.2
--- installers/windows/extra/libguile-srfi-srfi-60-v-1.la:1.1 Mon May 16
16:50:22 2005
+++ installers/windows/extra/libguile-srfi-srfi-60-v-1.la Fri Oct 7
13:34:59 2005
@@ -6,15 +6,17 @@
# The name that we can dlopen(3).
dlname=''
+###dlname='cygguile-srfi-srfi-60-v-1-1.dll'
# Names of this library.
library_names=''
+###library_names='libguile-srfi-srfi-60-v-1.dll.a'
# The name of the static archive.
old_library='libguile-srfi-srfi-60-v-1.a'
# Libraries that this one depends upon.
-dependency_libs=' -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile/.libs
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile-ltdl/.libs
/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile/libguile.la
/home/mingw/cygwin/root/usr/lib/libintl.la -liconv
/home/mingw/cygwin/root/usr/lib/libgmp.la -lcrypt
/home/mingw/cygwin/root/usr/lib/libltdl.la '
+dependency_libs=' -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile/.libs
-L/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile-ltdl/.libs
/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile/libguile.la
/home/mingw/cygwin/root/usr/lib/libintl.la -liconv
/home/mingw/cygwin/root/usr/lib/libgmp.la -lcrypt
/home/mingw/cygwin/root/usr/lib/libltdl.la '
# Version information for libguile-srfi-srfi-60-v-1.
current=4
@@ -33,4 +35,4 @@
# Directory that this library needs to be installed in:
libdir='/usr/lib'
-relink_command="(cd /home/mingw/cygwin/netrel/build/guile-1.7.2-1/srfi;
/bin/sh ../libtool --tag=CC --mode=relink i686-cygwin-gcc -I.
-I/home/mingw/cygwin/netrel/build/guile-1.7.2-1
-I/home/mingw/cygwin/netrel/src/guile-1.7.2-1
-I/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile
-I/home/mingw/cygwin/netrel/src/guile-1.7.2-1/libguile
-I/home/mingw/cygwin/root/usr/include -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L../libguile/.libs -I/home/mingw/cygwin/netrel/build/guile-1.7.2-1
-I/home/mingw/cygwin/netrel/src/guile-1.7.2-1
-I/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile -I.
-I/home/mingw/cygwin/netrel/src/guile-1.7.2-1/libguile
-I/home/mingw/cygwin/root/usr/include
-I/home/mingw/cygwin/root/usr/include/w32api ../libguile/libguile.la srfi-60.lo
-lgmp -lcrypt -lm -lltdl -g -O2 -Wall -Wmissing-prototypes -Werror -o
libguile-srfi-srfi-60-v-1.la -no-undefined -export-dynamic -version-info 1:0:0
-inst-prefix-dir /home/mingw/cygwin/netrel/inst/guile-1.7.2-1
@inst_prefix_dir@)"
+relink_command="(cd
/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/srfi; /bin/sh
../libtool --tag=CC --mode=relink i686-cygwin-gcc -I.
-I/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3
-I/home/janneke/installers/windows/cygwin/src/guile-1.7.2-3
-I/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile
-I/home/janneke/installers/windows/cygwin/src/guile-1.7.2-3/libguile
-I/home/mingw/cygwin/root/usr/include -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L../libguile/.libs
-I/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3
-I/home/janneke/installers/windows/cygwin/src/guile-1.7.2-3
-I/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile -I.
-I/home/janneke/installers/windows/cygwin/src/guile-1.7.2-3/libguile
-I/home/mingw/cygwin/root/usr/include
-I/home/mingw/cygwin/root/usr/include/w32api ../libguile/libguile.la srfi-60.lo
-lgmp -lcrypt -lm -lltdl -g -O2 -Wall -Wmissing-prototypes -Werror -o
libguile-srfi-srfi-60-v-1.la -no-undefined -export-dynamic -version-info 1:0:0
-inst-prefix-dir /home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3
@inst_prefix_dir@)"
Index: installers/windows/extra/libguilereadline-v-16.la
diff -u installers/windows/extra/libguilereadline-v-16.la:1.1
installers/windows/extra/libguilereadline-v-16.la:1.2
--- installers/windows/extra/libguilereadline-v-16.la:1.1 Mon May 16
16:50:22 2005
+++ installers/windows/extra/libguilereadline-v-16.la Fri Oct 7 13:34:59 2005
@@ -6,15 +6,17 @@
# The name that we can dlopen(3).
dlname=''
+###dlname='cygguilereadline-v-16-16.dll'
# Names of this library.
library_names=''
+###library_names='libguilereadline-v-16.dll.a'
# The name of the static archive.
old_library='libguilereadline-v-16.a'
# Libraries that this one depends upon.
-dependency_libs=' -L/usr/src/ncurses/ncurses-5.4/.build/lib
-L/home/mingw/cygwin/root/usr/lib -L/home/mingw/cygwin/root/usr/lib/w32api
-L/home/mingw/cygwin/root/usr/bin
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile/.libs
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile-ltdl/.libs
-L/home/mingw/cygwin/netrel/inst/guile-1.7.2-1/usr/lib -L/usr/lib
/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile/libguile.la
/home/mingw/cygwin/root/usr/lib/libintl.la -liconv
/home/mingw/cygwin/root/usr/lib/libgmp.la -lcrypt
/home/mingw/cygwin/root/usr/lib/libltdl.la -lreadline
-L/home/mingw/cygwin/netrel/inst/guile-1.7.2-1/home/mingw/cygwin/root/usr/lib
/home/mingw/cygwin/root/usr/lib/libncurses.la '
+dependency_libs=' -L/usr/src/ncurses/ncurses-5.4/.build/lib
-L/home/mingw/cygwin/root/usr/lib -L/home/mingw/cygwin/root/usr/lib/w32api
-L/home/mingw/cygwin/root/usr/bin
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-3/libguile/.libs
-L/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile-ltdl/.libs
-L/home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3/usr/lib
-L/usr/lib
/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile/libguile.la
/home/mingw/cygwin/root/usr/lib/libintl.la -liconv
/home/mingw/cygwin/root/usr/lib/libgmp.la -lcrypt
/home/mingw/cygwin/root/usr/lib/libltdl.la -lreadline
-L/home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3/home/mingw/cygwin/root/usr/lib
/home/mingw/cygwin/root/usr/lib/libncurses.la '
# Version information for libguilereadline-v-16.
current=8
@@ -33,4 +35,4 @@
# Directory that this library needs to be installed in:
libdir='/usr/lib'
-relink_command="(cd
/home/mingw/cygwin/netrel/build/guile-1.7.2-1/guile-readline; /bin/sh ./libtool
--tag=CC --mode=relink i686-cygwin-gcc
-L/usr/src/ncurses/ncurses-5.4/.build/lib -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile/.libs
-L/home/mingw/cygwin/netrel/build/guile-1.7.2-1/libguile-ltdl/.libs
-L/home/mingw/cygwin/netrel/inst/guile-1.7.2-1/usr/lib -L/usr/lib
../libguile/libguile.la -lreadline
-L/home/mingw/cygwin/netrel/inst/guile-1.7.2-1/home/mingw/cygwin/root/usr/lib
-lncurses readline.lo -o -g -O2 -o libguilereadline-v-16.la -version-info
16:0:0 -export-dynamic -no-undefined -inst-prefix-dir
/home/mingw/cygwin/netrel/inst/guile-1.7.2-1 @inst_prefix_dir@)"
+relink_command="(cd
/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/guile-readline;
/bin/sh ./libtool --tag=CC --mode=relink i686-cygwin-gcc
-L/usr/src/ncurses/ncurses-5.4/.build/lib -L/home/mingw/cygwin/root/usr/lib
-L/home/mingw/cygwin/root/usr/lib/w32api -L/home/mingw/cygwin/root/usr/bin
-L/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile/.libs
-L/home/janneke/installers/windows/cygwin/build/guile-1.7.2-3/libguile-ltdl/.libs
-L/home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3/usr/lib
-L/usr/lib ../libguile/libguile.la -lreadline
-L/home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3/home/mingw/cygwin/root/usr/lib
-lncurses readline.lo -o -g -O2 -o libguilereadline-v-16.la -version-info
16:0:0 -export-dynamic -no-undefined -inst-prefix-dir
/home/janneke/installers/windows/cygwin/inst/guile-1.7.2-3 @inst_prefix_dir@)"
Index: installers/windows/mknetrel/doc
diff -u installers/windows/mknetrel/doc:1.1 installers/windows/mknetrel/doc:1.2
--- installers/windows/mknetrel/doc:1.1 Mon May 16 16:50:22 2005
+++ installers/windows/mknetrel/doc Fri Oct 7 13:34:59 2005
@@ -10,7 +10,7 @@
cygdocdir=$docdir/$Cygwin
infodir=$docprefix/info
mandir=$docprefix/man
-packagedocdir=$docdir/$base-$ver
+packagedocdir=$docdir/$base
fixdoc () {
#
@@ -28,5 +28,10 @@
mkdir -p $packagedocdir
tar -C $inst/$docprefix/$base -cf - . | tar -C $inst/$packagedocdir -xf
-
fi
+ for i in $inst/$docprefix/info/*.info \
+ $inst/$docprefix/info/*.info-[0-9] \
+ $inst/$docprefix/info/*.info-[0-9][0-9]; do
+ gzip $i
+ done
true
}
Index: installers/windows/mknetrel/split
diff -u installers/windows/mknetrel/split:1.8
installers/windows/mknetrel/split:1.9
--- installers/windows/mknetrel/split:1.8 Sun Oct 2 15:26:13 2005
+++ installers/windows/mknetrel/split Fri Oct 7 13:34:59 2005
@@ -105,11 +105,11 @@
readmes="$(find . -maxdepth 1 -type f -a -name '[A-Z]*' | egrep -v
'Makefile|GNUmakefile')"
install -m644 $readmes $inst/$packagedocdir
+ install -m644 $cygwin/changelog $inst/$packagedocdir/changelog.$Cygwin
## Cygwin readmes
cd $src || exit 1
install -d -m755 $inst/$cygdocdir
- install -m644 $cygwin/changelog $inst/$cygdocdir/changelog.$Cygwin
cd $src || exit 1
install -m644 $cygwin/README $inst/$packagedocdir/README.$Cygwin
@@ -119,13 +119,47 @@
install -m644 $cygwin/out/README $inst/$cygdocdir/$package.README
}
+auto_requires () {
+ dlls=
+ requires=
+ dlls=$(find . -name '*dll' -o -name '*.exe' \
+ | xargs $cygcheck 2>&1 | grep '^ [^ ]' \
+ | tr -d '[ \r]' | sed '[EMAIL PROTECTED]@@g' | sort -u)
+ for x in $(ls -1 bin/* sbin/*); do
+ case $x in
+ *.exeXXX|*.dllXXX)
+ dlls="$($cygcheck $x 2>&1 | grep '^ [^ ]' | tr -d '[ \r]' |
sed '[EMAIL PROTECTED]@@g') $dlls"
+ ;;
+ esac
+ case "$(file -b $x)" in
+ "*Bourne shell script*")
+ requires="bash\n$requires"
+ ;;
+ "*guile*script*")
+ requires="guile\n$requires"
+ ;;
+ "*perl*script*")
+ requires="perl\n$requires"
+ ;;
+ "*python*script*")
+ requires="python\n$requires"
+ ;;
+ esac
+ done
+ for x in $dlls; do
+ requires="$(cyg-apt find $x | sed 's/:.*//')\n$requires"
+ done
+ requires=$(echo -e "$requires" | sort -u)
+ echo $requires
+}
+
hint () {
if [ -r $shint ]; then
cp $shint $hint
else
cat > $hint <<EOF
sdesc: "$name"
-ldesc: "$name - no description (missing $package/$(basename $shint) file)"
+ldesc: "$name - no description (missing $package/$cygwin/$(basename $shint)
file)"
EOF
fi
grep ^requires: $hint || echo "requires: $depends" >> $hint
@@ -134,6 +168,12 @@
mv $hint $hint~
grep -v build-requires $hint~ > $hint
fi
+ if iscygwin; then
+ cygcheck=cygcheck.exe
+ else
+ cygcheck="wine $cygwin_prefix/bin/cygcheck.exe"
+ fi
+ echo "#auto-requires: $(cd usr; auto_requires)" >> $hint
else
grep ^build-requires: $hint || echo "build-requires: $build_depends" >>
$hint
fi
@@ -182,7 +222,7 @@
cd $inst || exit 1
name=$base
- shint=$src/$cygwin/setup.hint
+ shint=$src/$cygwin/$name.hint
hint=$uploads/setup.hint
hint
find * -print | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|\.rej$|~$|^.#|CVS|/tags$' | sort | tar -T -
--no-recursion --owner=0 --group=0 -cjf $tarstem.tar.bz2
@@ -198,9 +238,9 @@
mkdir -p $subload || exit 1
echo creating $subtarstem.tar.bz2
name=$subname
+ cd $inst-$i
hint
grep ^external-source: $hint || echo "external-source: $base" >> $hint
- cd $inst-$i
hard2soft
find * -print | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|\.rej$|~$|^.#|CVS|/tags$' | sort | tar -T -
--no-recursion --owner=0 --group=0 -cjf $subtarstem.tar.bz2
done
@@ -209,8 +249,8 @@
cd $src/.. || exit 1
echo creating "$tarstem"-src.tar.bz2
##find $package_src/* -print -follow | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|~$|^.#|CVS|%redact|/tags$' | egrep -v
"$src_exclude" | sort | tar -T - --no-recursion --owner=0 --group=0 -cjf
"$tarstem"-src.tar.bz2
- find $package_src/* -print | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|\.rej$|~$|^.#|CVS|%redact|/tags$' | egrep -v
"$src_exclude" | sort | tar -T - --no-recursion --owner=0 --group=0 -cjf
"$tarstem"-src.tar.bz2
- ##cd $package_src && tar -cj --exclude='\.cvsignore' --exclude='\.bak$'
--exclude='\.orig$' --exclude='\.o$' --exclude='~$' --exclude='^.#'
--exclude='CVS' --exclude='%redact' --exclude='/tags$' --owner=0 --group=0 -f
"$tarstem"-src.tar.bz2 .
+ find $package_src/* -print | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|\.rej$|~$|^.#|CVS|%redact|/tags$|/TAGS$|autom4te.cache$'
| egrep -v "$src_exclude" | sort | tar -T - --no-recursion --owner=0 --group=0
-cjf "$tarstem"-src.tar.bz2
+ ##cd $package_src && tar -cj --exclude='\.cvsignore' --exclude='\.bak$'
--exclude='\.orig$' --exclude='\.o$' --exclude='~$' --exclude='^.#'
--exclude='CVS' --exclude='%redact' --exclude='/tags$' --exclude='/TAGS$'
--exclude='autom4te.cache' --owner=0 --group=0 -f "$tarstem"-src.tar.bz2 .
postpackage
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
