gitarre

diff --git a/TestMbuild/FitnessePages/PdfTest/content.txt b/TestMbuild/FitnessePages/PdfTest/content.txt
index ec78be0..b727ffd 100644 (file)
--- a/TestMbuild/FitnessePages/PdfTest/content.txt
+++ b/TestMbuild/FitnessePages/PdfTest/content.txt
@@ -4,12 +4,15 @@ Build cobol handout in r.320
 
 #|call script|!-rm -r suites/Projekte || true -!|
 !|test.util.CallScript|
+|call script|!- rm suites/Cobol_320.pdf || true -!|
 |call script|if ! [ -d suites/Projekte ]; then svn co http://wagnertech.de/svn/Projekte suites/Projekte/; fi|
 |call script|svn up -r 320 suites/Projekte|
 |call script|mkdir -p suites/Projekte/Kurse/Logo|
 |call script|cp etc/Newelements.jpeg etc/UmschlagNewElements.pdf etc/Newelements1.pdf etc/Newelements2.pdf etc/Newelements3.pdf suites/Projekte/Kurse/Logo|
-|call script|cd suites/Projekte; mconfigure cobol|
-|call script|rm Projekte/debian/cobol.conf|
+|call script|cp etc/.cm.ignore suites/Projekte/|
+|call script|cd suites/Projekte; mconfigure -o cobol|
+|call script|rm suites/Projekte/.cm.ignore|
+|call script|ls suites/Cobol_320.pdf|
 
 Build cobol handout in r.323
 

diff --git a/TestMbuild/etc/Newelements.jpeg b/TestMbuild/etc/Newelements.jpeg
new file mode 100644 (file)
index 0000000..def536d
Binary files /dev/null and b/TestMbuild/etc/Newelements.jpeg differ

diff --git a/TestMbuild/etc/Newelements1.pdf b/TestMbuild/etc/Newelements1.pdf
new file mode 100644 (file)
index 0000000..1b7c5f1
Binary files /dev/null and b/TestMbuild/etc/Newelements1.pdf differ

diff --git a/TestMbuild/etc/Newelements2.pdf b/TestMbuild/etc/Newelements2.pdf
new file mode 100644 (file)
index 0000000..91662c4
Binary files /dev/null and b/TestMbuild/etc/Newelements2.pdf differ

diff --git a/TestMbuild/etc/Newelements3.pdf b/TestMbuild/etc/Newelements3.pdf
new file mode 100644 (file)
index 0000000..2faec5d
Binary files /dev/null and b/TestMbuild/etc/Newelements3.pdf differ

diff --git a/TestMbuild/etc/UmschlagNewElements.pdf b/TestMbuild/etc/UmschlagNewElements.pdf
new file mode 100644 (file)
index 0000000..79ba2a3
Binary files /dev/null and b/TestMbuild/etc/UmschlagNewElements.pdf differ

diff --git a/tools/make/configure b/tools/make/configure
index acf16cb..2eb9f91 100755 (executable)
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -74,6 +74,14 @@ function check_unversioned {
                echo "debian.*" >> .cm.ignore
                echo "up.*" >> .cm.ignore
        fi
+
+       # add auto created files to .cm.ignore
+       if ! grep Makefile .cm.ignore >/dev/null ; then echo "Makefile" >>.cm.ignore; fi
+       if ! grep configure .cm.ignore >/dev/null ; then echo "configure" >>.cm.ignore; fi
+       if ! grep debian/rules .cm.ignore >/dev/null ; then echo "debian/rules" >>.cm.ignore; fi
+       if ! grep debian/rules.pre .cm.ignore >/dev/null ; then echo "debian/rules.pre" >>.cm.ignore; fi
+       if ! grep debian/setenv.sh .cm.ignore >/dev/null ; then echo "debian/setenv.sh" >>.cm.ignore; fi
+       if ! grep debian/tmp .cm.ignore >/dev/null ; then echo "debian/tmp" >>.cm.ignore; fi
        
        project=$(pwd)
        project=${project##*/}
@@ -81,7 +89,7 @@ function check_unversioned {
                mCM $project -b -an > /dev/null
                wc=$(wc $project.batch)
                rm $project.batch
-               if [ "${wc:0:5}" != "0 0 0" ]
+               if [ "${wc:0:1}" != "1" ]
                then
                        echo "M"
                fi
@@ -221,10 +229,10 @@ then
 fi
 
 # read build configuration, if existing
-if [ -f debian/$paket.conf ]
-then
-       . debian/$paket.conf
-fi
+#if [ -f debian/$paket.conf ]
+#then
+#      . debian/$paket.conf
+#fi
 
 if [ -n "$ARCH" -a -n "$cross" ]
 then
@@ -362,14 +370,14 @@ else
                cp debian/rules.pre $BUILD_DIR/$compile_dir/make.pre
                pushd $BUILD_DIR/$compile_dir >/dev/null
                        ln -sf /usr/share/mbuild/makefile .
-#                      if [ -n "$sources_suffix" ]
-#                      then
-#                              echo "SOURCES = \\" >> make.pre
-#                              for suf in $sources_suffix
-#                              do
-#                                      find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
-#                              done
-#                              echo >> make.pre
+                       if [ -n "$sources_suffix" ]
+                       then
+                               echo "SOURCES = \\" >> make.pre
+                               for suf in $sources_suffix
+                               do
+                                       find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
+                               done
+                               echo >> make.pre
                        fi
                popd >/dev/null
        fi
@@ -381,6 +389,7 @@ else
                        add_sources tex xml
                        echo >> make.pre
                popd >/dev/null
+       fi
        if [ -x debian/$paket.prebuild ]
        then
                pushd $BUILD_DIR >/dev/null

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index e091ca6..0d053b1 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -3,7 +3,8 @@ set -e
 
 function echo_usage {
        echo "usage: mconfigure [options] <package>"
-       ./configure -I
+       echo "  -o: old style build (not recommended"
+       ./configure -h
 }
 
 function create_conf {
@@ -45,9 +46,11 @@ configure=0
 configure_args="-i debian/tmp"
 while [ $OPTIND -le "$#" ]
 do
-       if getopts "c" opt
+       if getopts "o" opt
        then
                case $opt in
+                       o) old_build=1
+                               ;;
                        \?) $confirure_args="$configure_ars -$OPTARG"
                                if [ $OPTARG="a" -o $OPTARG="C" -o $OPTARG="i" -o $OPTARG="v" ]
                                then
@@ -104,6 +107,11 @@ fi
 
 # perform configure
 . debian/$paket.conf
+if [ -n $old_build ]
+then
+       rm debian/$paket.conf
+fi
+
 if [ "$compile_type" != "NONE" ]
 then
        configure_args="$configure_args -b"
@@ -116,6 +124,7 @@ then
                echo "compile_type required in $paket.conf"
                exit 51
        fi
+       configure_args="$configure_args -c $compile_type"
 fi
 if [ "$target_type" == "FILE" ]
 then