[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: NOTES
User: ahvezda
Date: 06/12/10 18:22:53
Modified: . NOTES buildgeda.sh dist.bom pangorc
Log:
More work on getting distribution tarball to work correctly. Updated bom
file to have the correct versions of the latest files.
Revision Changes Path
1.4 +2 -0 eda/geda/buildgeda/NOTES
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NOTES
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/buildgeda/NOTES,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NOTES 10 Dec 2006 21:48:09 -0000 1.3
+++ NOTES 10 Dec 2006 23:22:52 -0000 1.4
@@ -6,6 +6,8 @@
For verilog-0.8.3:
Might need to install gperf
+What's with etc/fonts/fonts.conf.bak? Created by buildgeda or by install?
+
tar cvfz /tmp/blah.tgz -T$HOME/gedabuild/tarball.bom
Document header files that need to be moved AWAY:
1.7 +48 -18 eda/geda/buildgeda/buildgeda.sh
(In the diff below, changes in quantity of whitespace are not shown.)
Index: buildgeda.sh
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/buildgeda/buildgeda.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- buildgeda.sh 10 Dec 2006 21:48:09 -0000 1.6
+++ buildgeda.sh 10 Dec 2006 23:22:53 -0000 1.7
@@ -36,7 +36,7 @@
export SRCDIR=`pwd`/sources
# Set the directory where the dist tarball will be assembled
-export DISTDIR=`pwd`/geda-$VERSION
+export DISTDIR=`pwd`/gedadist-$VERSION
# Set these to point to GNU make
export MAKE=make
@@ -674,12 +674,13 @@
# Create distribution directory and copy all the files specified
# in dist.bom into this directory
+ echo Copying and installing files
for i in `cat dist.bom`
do
comment=`echo $i | grep ^#`
if [ "$comment" = "" ]
then
- echo Copying $i
+ echo -n Copying $i >> $LOGFILE
if [ ! -e "$INSTALLDIR/$i" ]
then
@@ -694,22 +695,47 @@
dirname=`dirname $i`
cp -rp "$INSTALLDIR/$i" "$DISTDIR/$dirname"
else
+ symbolic=`file $INSTALLDIR/$i | grep symbolic`
+ if [ "$symbolic" != "" ]
+ then
+ echo -n " (symbolic link)" >> $LOGFILE
+ cwdsave=`pwd`
+
+ srcbasedir=`dirname $INSTALLDIR/$i`
+ srcbasename=`basename $i`
+ cd $srcbasedir
+ tar cf /tmp/$$.tar $srcbasename
+
+ destbasedir=`dirname $DISTDIR/$i`
+ cd $destbasedir
+ tar xf /tmp/$$.tar
+
+ rm -f /tmp/$$.tar
+ cd $cwdsave
+ else
install -D "$INSTALLDIR/$i" "$DISTDIR/$i"
fi
fi
+ echo "" >> $LOGFILE
+ fi
done
- cp scripts/execwrapper $DISTDIR/bin
+ # Handle special case for pango
+ cp -f pangorc $DISTDIR/etc/pango
+ fixedupfiles="./etc/pango/pangorc"
+
+ cp -f scripts/execwrapper $DISTDIR/bin
chmod 755 $DISTDIR/bin/execwrapper
# Rename and link all files to the execwrapper
+ echo Setting up execwrapper
cd $DISTDIR/bin
for i in *
do
type=`file $i | grep ELF`
if [ "$type" != "" ]
then
- echo "Linking wrapper for $i"
+ echo "Linking wrapper for $i" >> $LOGFILE
mv -f $i $i.x
ln -s ./execwrapper $i
fi
@@ -718,25 +744,29 @@
# Fix up hardcoded path to something the install script can fixup
#
+ echo Fixing up paths
cd $DISTDIR
# Ignore all: .so, .la, all files in bin
files=`find . -name \* -print | grep -v \.so | grep -v \.la | grep -v /bin/`
- fixedupfiles=
for i in $files
do
+ if [ ! -d "$i" ]
+ then
workneeded=`grep "$INSTALLDIR" $i`
if [ "$workneeded" != "" ]
then
- echo Fixing up $i
+ echo Fixing up $i >> $LOGFILE
fixedupfiles="$fixedupfiles $i"
mv $i $i.old
cat $i.old | sed "s^$INSTALLDIR^%INSTALLDIR%^g" > $i
rm -f $i.old
fi
+ fi
done
- cd $cpwd
+ cd $cpwd
+
# Create distribution directory
cd $DISTDIR
mkdir dist > /dev/null 2>&1
@@ -753,10 +783,10 @@
# Create distribution tarball
echo Creating distribution tarball
- rm -f geda-$VERSION.tar.gz
+ rm -f gedadist-$VERSION.tar.gz
distbasename=`basename $DISTDIR`
- tar cvf geda-$VERSION.tar $distbasename > distlog.txt
- gzip -9 geda-$VERSION.tar
+ tar cvf gedadist-$VERSION.tar $distbasename >> $LOGFILE
+ gzip -9 gedadist-$VERSION.tar
# Cleanup distdir
rm -rf $DISTDIR
1.2 +58 -90 eda/geda/buildgeda/dist.bom
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dist.bom
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/buildgeda/dist.bom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dist.bom 6 Nov 2006 04:38:14 -0000 1.1
+++ dist.bom 10 Dec 2006 23:22:53 -0000 1.2
@@ -5,9 +5,6 @@
bin/sch2eaglepos.sh
bin/gattrib
bin/gsymcheck
-bin/geda
-bin/graphman
-bin/raw2gw
bin/gmk_sym
bin/smash_megafile
bin/convert_sym
@@ -25,13 +22,16 @@
bin/pads_backannotate
bin/garchive
bin/gsymfix.pl
-#bin/gspiceui
+bin/gspiceui
+bin/iverilog-vpi
+bin/vvp
+bin/iverilog
etc/fonts
etc/pango
etc/gtk-2.0
lib/libgcc_s.so.1
lib/libgcc_s.so
-lib/libstdc++.so.6.0.8
+lib/libstdc++.so.6.0.7
lib/libstdc++.so.6
lib/libstdc++.so
lib/libmudflap.so.0.0.0
@@ -40,36 +40,33 @@
lib/libmudflapth.so.0.0.0
lib/libmudflapth.so.0
lib/libmudflapth.so
-lib/libssp.so.0.0.0
-lib/libssp.so.0
-lib/libssp.so
lib/libjpeg.so.62.0.0
lib/libjpeg.so.62
lib/libjpeg.so
-lib/libtiff.so.3.7.4
+lib/libtiff.so.3.8.2
lib/libtiff.so.3
lib/libtiff.so
lib/libasprintf.so.0.0.0
lib/libasprintf.so.0
lib/libasprintf.so
-lib/libgettextlib-0.14.5.so
+lib/libgettextlib-0.16.so
lib/libgettextlib.so
-lib/libgettextsrc-0.14.5.so
+lib/libgettextsrc-0.16.so
lib/preloadable_libintl.so
lib/libgettextsrc.so
-lib/libgettextpo.so.0.1.0
+lib/libgettextpo.so.0.3.0
lib/libgettextpo.so.0
lib/libgettextpo.so
-lib/libfreetype.so.6.3.8
+lib/libfreetype.so.6.3.10
lib/libfreetype.so.6
lib/libfreetype.so
-lib/libXrender.so.1.2.2
+lib/libXrender.so.1.3.0
lib/libXrender.so.1
lib/libXrender.so
-lib/libexpat.so.0.5.0
-lib/libexpat.so.0
+lib/libexpat.so.1.5.0
+lib/libexpat.so.1
lib/libexpat.so
-lib/libfontconfig.so.1.0.4
+lib/libfontconfig.so.1.1.0
lib/libfontconfig.so.1
lib/libfontconfig.so
lib/libXft.so.2.1.2
@@ -84,10 +81,10 @@
lib/libz.so.1.2.3
lib/libz.so
lib/libz.so.1
-lib/libpng12.so.0.0.0
+lib/libpng12.so.0.12.0
lib/libpng12.so.0
lib/libpng12.so
-lib/libpng.so.3.0.0
+lib/libpng.so.3.12.0
lib/libpng.so.3
lib/libpng.so
lib/libcairo.so.2.9.2
@@ -96,85 +93,45 @@
lib/glib-2.0
lib/glib-2.0/include
lib/glib-2.0/include/glibconfig.h
-lib/libglib-2.0.so.0.800.4
+lib/libglib-2.0.so.0.1200.4
lib/libglib-2.0.so.0
lib/libglib-2.0.so
-lib/libgobject-2.0.so.0.800.4
+lib/libgobject-2.0.so.0.1200.4
lib/libgobject-2.0.so.0
lib/libgobject-2.0.so
-lib/libgmodule-2.0.so.0.800.4
+lib/libgmodule-2.0.so.0.1200.4
lib/libgmodule-2.0.so.0
lib/libgmodule-2.0.so
-lib/libgthread-2.0.so.0.800.4
+lib/libgthread-2.0.so.0.1200.4
lib/libgthread-2.0.so.0
lib/libgthread-2.0.so
lib/libatk-1.0.so.0.1011.0
lib/libatk-1.0.so.0
lib/libatk-1.0.so
-lib/libpango-1.0.so.0.1001.0
+lib/libpango-1.0.so.0.1400.7
lib/libpango-1.0.so.0
lib/libpango-1.0.so
-lib/libpangox-1.0.so.0.1001.0
+lib/libpangox-1.0.so.0.1400.7
lib/libpangox-1.0.so.0
lib/libpangox-1.0.so
-lib/libpangoft2-1.0.so.0.1001.0
+lib/libpangoft2-1.0.so.0.1400.7
lib/libpangoft2-1.0.so.0
lib/libpangoft2-1.0.so
-lib/libpangoxft-1.0.so.0.1001.0
-lib/libpangoxft-1.0.so.0
-lib/libpangoxft-1.0.so
-lib/libpangocairo-1.0.so.0.1001.0
+lib/libpangocairo-1.0.so.0.1400.7
lib/libpangocairo-1.0.so.0
lib/libpangocairo-1.0.so
-lib/pango/1.4.0/modules
-lib/pango/1.4.0/modules/pango-arabic-fc.so
-lib/pango/1.4.0/modules/pango-basic-x.so
-lib/pango/1.4.0/modules/pango-basic-fc.so
-lib/pango/1.4.0/modules/pango-hangul-fc.so
-lib/pango/1.4.0/modules/pango-hebrew-fc.so
-lib/pango/1.4.0/modules/pango-indic-fc.so
-lib/pango/1.4.0/modules/pango-khmer-fc.so
-lib/pango/1.4.0/modules/pango-syriac-fc.so
-lib/pango/1.4.0/modules/pango-thai-fc.so
-lib/pango/1.4.0/modules/pango-tibetan-fc.so
-lib/libgdk_pixbuf-2.0.so.0.800.7
+lib/pango/1.5.0
+lib/libgdk_pixbuf-2.0.so.0.1000.6
lib/libgdk_pixbuf-2.0.so.0
lib/libgdk_pixbuf-2.0.so
-lib/gtk-2.0/2.4.0/loaders
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-png.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/2.4.0/immodules
-lib/gtk-2.0/2.4.0/immodules/im-xim.so
-lib/gtk-2.0/2.4.0/immodules/im-am-et.so
-lib/gtk-2.0/2.4.0/immodules/im-cedilla.so
-lib/gtk-2.0/2.4.0/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/2.4.0/immodules/im-inuktitut.so
-lib/gtk-2.0/2.4.0/immodules/im-ipa.so
-lib/gtk-2.0/2.4.0/immodules/im-thai-broken.so
-lib/gtk-2.0/2.4.0/immodules/im-ti-er.so
-lib/gtk-2.0/2.4.0/immodules/im-ti-et.so
-lib/gtk-2.0/2.4.0/immodules/im-viqr.so
-lib/gtk-2.0/2.4.0/engines
-lib/gtk-2.0/2.4.0/engines/libpixmap.so
-lib/libgdk-x11-2.0.so.0.800.7
+lib/gtk-2.0/2.10.0
+lib/libgdk-x11-2.0.so.0.1000.6
lib/libgdk-x11-2.0.so.0
lib/libgdk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0.800.7
+lib/libgtk-x11-2.0.so.0.1000.6
lib/libgtk-x11-2.0.so.0
lib/libgtk-x11-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0.800.7
+lib/libgdk_pixbuf_xlib-2.0.so.0.1000.6
lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgdk_pixbuf_xlib-2.0.so
lib/libguile-ltdl.so.1.0.1
@@ -199,50 +156,61 @@
lib/libgstroke.so.0
lib/libgstroke.so
lib/libwx_base-2.6.so.0
-lib/libwx_base-2.6.so.0.0.0
+lib/libwx_base-2.6.so.0.3.1
lib/libwx_base-2.6.so
lib/libwx_base_net-2.6.so.0
-lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_net-2.6.so.0.3.1
lib/libwx_base_net-2.6.so
lib/libwx_gtk2_core-2.6.so.0
-lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so.0.3.1
lib/libwx_gtk2_core-2.6.so
lib/libwx_gtk2_adv-2.6.so.0
-lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so.0.3.1
lib/libwx_gtk2_adv-2.6.so
lib/libwx_gtk2_media-2.6.so
-lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so.0.3.1
lib/libwx_gtk2_media-2.6.so.0
lib/libwx_gtk2_html-2.6.so.0
-lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so.0.3.1
lib/libwx_gtk2_html-2.6.so
lib/libwx_gtk2_qa-2.6.so
-lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so.0.3.1
lib/libwx_gtk2_qa-2.6.so.0
lib/libwx_base_xml-2.6.so.0
-lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so.0.3.1
lib/libwx_base_xml-2.6.so
lib/libwx_gtk2_xrc-2.6.so.0
-lib/libwx_gtk2_xrc-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so.0.3.1
lib/libwx_gtk2_xrc-2.6.so
-lib/libgeda.so.24.0.0
-lib/libgeda.so.24
+lib/libgeda.so.27.0.0
+lib/libgeda.so.27
lib/libgeda.so
-man/man1/gschem.1
-man/man1/gnetlist.1
-man/man1/gsymcheck.1
-man/man1/grenum.1
+lib/libvpi.a
+lib/libveriuser.a
+lib/ivl
+man/man1/iverilog-vpi.1
+man/man1/vvp.1
+man/man1/iverilog-fpga.1
+man/man1/iverilog.1
+include/ivl_target.h
+include/_pli_types.h
+include/vpi_user.h
+include/acc_user.h
+include/veriuser.h
+share/man/man1/gschem.1
+share/man/man1/gnetlist.1
+share/man/man1/gsymcheck.1
+share/man/man1/grenum.1
share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
share/locale/ru/LC_MESSAGES/geda-gschem.mo
share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
-share/locale/de_DE/LC_MESSAGES/geda.mo
share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-share/locale/fr_FR/LC_MESSAGES/geda.mo
share/doc/geda-doc
share/themes
share/guile
share/gEDA
+share/gspiceui
1.2 +2 -2 eda/geda/buildgeda/pangorc
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pangorc
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/buildgeda/pangorc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pangorc 9 Oct 2006 02:05:05 -0000 1.1
+++ pangorc 10 Dec 2006 23:22:53 -0000 1.2
@@ -4,8 +4,8 @@
#
[Pango]
-ModuleFiles = /usr/local/geda-20050820/etc/pango/pango.modules
+ModuleFiles = %INSTALLDIR%/etc/pango/pango.modules
[PangoX]
-AliasFiles = /usr/local/geda-20050820/etc/pango/pangox.aliases
+AliasFiles = %INSTALLDIR%/etc/pango/pangox.aliases
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs