diff --git a/Scripts/GenInstallcfg b/Scripts/GenInstallcfg index 2e55921..435f9fb 100755 --- a/Scripts/GenInstallcfg +++ b/Scripts/GenInstallcfg @@ -43,74 +43,44 @@ WDIR=`pwd` source $VMAKEDIR/defsys source $VMAKEDIR/functions/functions + +PKGNAME=$1 +TMPFILE=`mktemp` +TMPFILE2=`mktemp` +rm $TMPFILE +rm $TMPFILE2 +NUMDEPSOLD=0 +NUMDEPSNEW=0 + GenDeps() { - BasePkgName=`basename $1` - echo $BasePkgName - AbsPkgName=`find $DISTTARGET -name "$BasePkgName"` - PkgPathName=`dirname $AbsPkgName` - DepsFile=`echo $BasePkgName|sed -e "s/.tbz$/.dep/"` - if [ -f $PkgPathName/$DepsFile ]; then - cat $PkgPathName/$DepsFile|awk '{print $2".tbz"}' - fi - } - -FindAllDeps() { - DepsFound=1 - - if [ -f /tmp/deps$$ ]; then - rm /tmp/deps$$ - fi - while [ "$1" ]; do - GenDeps $1|sort -u >>/tmp/deps$$ - shift + PKGFILE=`grep "SN=$PKGNAME;" $DISTTARGET/PkgList|\ + awk -F";" '{print $2}'|sed -e "s/PF=//"` + PKGPATH=`grep "PF=$PKGFILE;" $DISTTARGET/PkgList|\ + awk -F";" '{print $3}'|\ + sed -e "s/PP=//"` + extractvarchive $DISTTARGET/$PKGPATH/$PKGFILE dep >$TMPFILE + NUMDEPSOLD=`cat $TMPFILE|wc -l` + while [ ! $NUMDEPSOLD == $NUMDEPSNEW ]; do + echo >&2 "OLD=$NUMDEPSOLD; NEW=$NUMDEPSNEW" + NUMDEPSOLD=$NUMDEPSNEW + exec 3<$TMPFILE + while read <&3 FLAG SHNAME; do + grep "SN=$SHNAME;" $DISTTARGET/PkgList|awk -F";" '{print $2}'|sed -e "s/PF=//" + done > $TMPFILE2 + exec 3>&- + for i in `cat $TMPFILE2`; do + PKGPATH=`grep "PF=$i;" $DISTTARGET/PkgList|\ + awk -F";" '{print $3}'|\ + sed -e "s/PP=//"` + extractvarchive $DISTTARGET/$PKGPATH/$i dep + done >>$TMPFILE + rm $TMPFILE2 + cat $TMPFILE |sort -u >$TMPFILE2 + mv $TMPFILE2 $TMPFILE + NUMDEPSNEW=`cat $TMPFILE|wc -l` done - cat /tmp/deps$$|sort -u >/tmp/deps2.$$ - mv /tmp/deps2.$$ /tmp/deps$$ - while [ "$DepsFound" == "1" ]; do - DepsFound=0 - for i in `cat /tmp/deps$$`; do - for j in `GenDeps $i`; do - if ! grep $j /tmp/deps$$ 2>&1 >/dev/null; then - DepsFound=1 - echo $j - fi - done - done |sort -u >/tmp/deps2.$$ - cat /tmp/deps2.$$ >>/tmp/deps$$ - rm /tmp/deps2.$$ - cat /tmp/deps$$|sort -u >/tmp/deps2.$$ - mv /tmp/deps2.$$ /tmp/deps$$ - done - cat /tmp/deps$$ - rm /tmp/deps$$ - } + cat $TMPFILE + rm $TMPFILE +} -FindAllDeps $* >/tmp/depends$$ -exec 3<$DISTTARGET/../install/All.cfg -read -r <&3 CDROM PKGNAME -while [ "$CDROM" ]; do - GrepName=`echo $PKGNAME|awk -F '[' '{print $1}'` - CheckName=`basename $GrepName|sed -e "s/\.tbz$//"` - if grep $CheckName /tmp/depends$$ 2>&1 >/dev/null; then - echo "$CDROM $PKGNAME" - fi - read -r <&3 CDROM PKGNAME -done >/tmp/tmpinstall.cfg$$ -exec 3>- -rm /tmp/depends$$ - -CFGFILE=`basename $1|sed -e "s/\.tbz$//"`.cfg -cp $DISTTARGET/../install/BaseDevel.cfg $CFGFILE - -exec 3&1 >/dev/null; then - echo -n - else - echo "$CDROM $PKGNAME" >>$CFGFILE - fi - read -r <&3 CDROM PKGNAME -done -exec 3>- -rm /tmp/tmpinstall.cfg$$ +GenDeps diff --git a/SysBuild/xsys/kwave b/SysBuild/guibased/kwave similarity index 58% rename from SysBuild/xsys/kwave rename to SysBuild/guibased/kwave index 8995d5a..07e3b66 100644 --- a/SysBuild/xsys/kwave +++ b/SysBuild/guibased/kwave @@ -1,7 +1,7 @@ #!/bin/bash #Framework, welches ein komplettes Linux System aus den Sourcen erstellt #dieses Framework wird im CVS Repository -#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt +#:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt # #Lage dieser Datei im Archiv: $HeadURL$ # @@ -55,13 +55,11 @@ # Wichtig bei packeten mit postinstallroutine, die software aus dem # frisch installierten Packet verwendet (wie z.B. postgresql) # 64 : sourcetree aufräumen nach packeterstellung unterbinden. -# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum -# kümmern - -#Module zur Erstellung des Packetes: -#Quelle der Source Archive: http://kwave.sourceforge.net/ -#Kurzbeschreibung: Wave Editor with kde # +#Module zur Erstellung des Packetes: kwave +#Quelle der Source Archive: http://kwave.sourceforge.net/download.html +#Kurzbeschreibung: +#kde4 sound editor # #Letzte Änderung von: $Author$ #Datum der letzten Änderung: $Date$ @@ -69,34 +67,77 @@ # # -SRCPATH=X11_2/KDE +SRCPATH=GuiBased/Apps + +#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen +#ausgeführt (sprich unpack src; cd src; premk) +#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { - echo "Nothing to do for premk()" + echo "Nothing do do for premk()" } -mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi - ldconfig - export QTDIR=/usr/$LIBDIR/qt - export PATH=$PATH:/usr/$LIBDIR/qt/bin:/usr/X11R7/bin - make CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/$LIBDIR \ - -L/usr/$LIBDIR \ - -L/usr/X11R7/$LIBDIR \ - -L/usr/$LIBDIR/qt/lib \ - -L/opt/kde/$LIBDIR" \ - CONFIGURE_OPTS=" --target=$TARGET \ - --prefix=/opt/kde \ - --libdir=/opt/kde/$LIBDIR" \ - -f Makefile.dist +mk32() { + mkdir -v build && + cd build && + USE_ARCH=32 \ + CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \ + CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \ + LDEMULATION="elf32_i386" \ + cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_INSTALL_DIR=${KDEDIR}/lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \ + -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \ + -DX11_LIBRARY=/usr/X11R7/lib \ + -DXEXT_LIBRARY=/usr/X11R7/lib \ + -DOPENGL_INCLUDE_DIR=/usr/include/GL \ + -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \ + -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \ + -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \ + -DLIB_SUFFIX= \ + .. && + for i in build.make link.txt relink.txt; do + find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \; + done make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \; + make DESTDIR=$TMPROOT install + cd .. + rm -r build } -postmk() { - echo "Nothing to do for postmk()" +#Hier wird der Make Prozess der Sourcen definiert +mk() { + if [ "$MK64BIT" == "true" ]; then + LIBSUFFIX="64" + else + LIBSUFFIX="" + fi + mkdir -v build && + cd build && + USE_ARCH=$UARCH \ + cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_INSTALL_DIR=${KDEDIR}/$LIBDIR \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \ + -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \ + -DX11_LIBRARY=/usr/X11R7/$LIBDIR \ + -DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \ + -DOPENGL_INCLUDE_DIR=/usr/include/GL \ + -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \ + -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \ + -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \ + -DLIB_SUFFIX=${LIBSUFFIX}\ + .. && + make -j $NUMCPU + make DESTDIR=$TMPROOT install +} + +#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann +#in $TMPROOT noch einiges korrigieren +postmk() { + GetSVN Viitor_kde $TMPROOT } diff --git a/SysBuild/xsys/taskjuggler b/SysBuild/guibased/taskjuggler similarity index 94% rename from SysBuild/xsys/taskjuggler rename to SysBuild/guibased/taskjuggler index 2e8e5a3..be928de 100644 --- a/SysBuild/xsys/taskjuggler +++ b/SysBuild/guibased/taskjuggler @@ -72,10 +72,12 @@ # # -SRCPATH=X11_2/Office +SRCPATH=GuiBased/Apps premk() { - echo "Nothing to do for premk()" + export QTDIR=$QT3DIR + echo "$QTDIR" + read } mk() { @@ -83,14 +85,14 @@ mk() { ADDOPTIONS="--libdir=\${prefix}/lib64" fi ldconfig - export QTDIR=/usr/$LIBDIR/qt - export PATH=$PATH:/usr/$LIBDIR/qt/bin:/usr/X11R7/bin + export PATH=$PATH:/opt/qt-3/bin:/usr/X11R7/bin CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/usr/$LIBDIR/qt/lib" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/qt-3/$LIBDIR" \ ./configure --target=$TARGET \ $ADDOPTIONS \ - --prefix=/opt/kde + --prefix=/usr/X11R7 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install }