From hartmut at tyndur.org Wed Apr 4 16:38:16 2012 From: hartmut at tyndur.org (Alexander Kluth) Date: Wed, 4 Apr 2012 16:38:16 +0200 Subject: [tyndur-devel] [PATCH] =?UTF-8?q?shell:=20comm=5Fm=5Fands.c=20vern=FCnftig=20gel=F6?= =?UTF-8?q?scht?= Message-ID: <1333550296-27791-1-git-send-email-hartmut@tyndur.org> git rm commmands.c, da die Datei bei mir sonst drin blieb Signed-off-by: Alexander Kluth --- src/modules/c/shell/commmands.c | 356 --------------------------------------- 1 file changed, 356 deletions(-) delete mode 100644 src/modules/c/shell/commmands.c diff --git a/src/modules/c/shell/commmands.c b/src/modules/c/shell/commmands.c deleted file mode 100644 index 6dc4c30..0000000 --- a/src/modules/c/shell/commmands.c +++ /dev/null @@ -1,356 +0,0 @@ -/* - * Copyright (c) 2007 The tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Antoine Kaufmann. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the tyndur Project - * and its contributors. - * 4. Neither the name of the tyndur Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "shell.h" -#include -#include -#include -#include -#include - -#define TMS_MODULE cmd -#include - -#include - - -//Hier koennen die Debug-Nachrichten aktiviert werden -#define DEBUG 0 - -#if DEBUG == 1 - #define DEBUG_MSG(s) printf("[ SHELL ] debug: %s() '%s'\n",__FUNCTION__,s) - #define DEBUG_MSG1(x, y) \ - printf("[ SHELL ] debug: %s() '", __FUNCTION__); \ - printf(x, y); \ - printf("'\n"); - #define DEBUG_MSG2(x, y, z) \ - printf("[ SHELL ] debug: %s() '", __FUNCTION__); \ - printf(x, y, z); \ - printf("'\n"); -#else - #define DEBUG_MSG(s) - #define DEBUG_MSG1(s,x) - #define DEBUG_MSG2(s,x,y) -#endif - - -int shell_start_path_app(const char* cmd, bool wait) -{ - DEBUG_MSG1("Starte das Programm %s", cmd); - pid_t pid; - - // Fuehrende Leerzeichen im Befehl grosszuegig ueberspringen - while (*cmd == ' ') { - cmd++; - } - - pid = init_execute(cmd); - - // Fehler ist aufgetreten - if (pid == 0) { - return -1; - } - - // Wenn es gewuenscht wurde, wird jetzt gewartet, bis der Prozess beendet - // wird. - if (wait == true) { - int status; - while (waitpid(pid, &status, 0) != pid); - } - return 0; -} - -/** - * Wird aufgerufen, wenn keiner der internen Befehle passt. - */ -int shell_command_default(int argc, char* argv[], const char* cmd) -{ - // Leere Kommandozeilen sollen keine Fehlermeldungen bringen - if (strlen(cmd) == 0) { - return 0; - } - - if (shell_start_path_app(cmd, true) == 0) { - return 0; - } - - puts(TMS(exec_not_found, "Befehl wurde nicht gefunden!")); - return -1; -} - -/** - * Eine ausfuerbare Datei im aktuellen Verzeichnis oder in PATH starten. - */ -int shell_command_start(int argc, char* argv[], const char* cmd) -{ - const char* program; - DEBUG_MSG("start"); - - if (argc < 2) { - printf(TMS(start_usage, "\nAufruf: start [Argumente ...]\n")); - return -1; - } - - program = strchr(cmd, ' ') + 1; - if (program == NULL) { - return -1; - } - - if (shell_start_path_app(program, false) == 0) { - return 0; - } - - puts(TMS(start_not_found, "Datei wurde nicht gefunden!")); - return -1; -} - - -/** - * - */ -int shell_command_help(int argc, char* argv[], const char* args) -{ - char* help_args = strchr(args, ' '); - char* cmd; - int ret; - - // Erstmal versuchen, ob thelp installiert ist - if (help_args == NULL) { - cmd = strdup("thelp tyndur"); - } else { - asprintf(&cmd, "thelp %s", help_args + 1); - } - - ret = shell_start_path_app(cmd, true); - free(cmd); - if (ret == 0) { - return 0; - } - - // Wenn nicht, gibt es eben die klassische Hilfe - puts(TMS(help_text, - "Verfügbare Befehle:\n" - - " Startet das Programm an im Vordergrund\n" - " start Startet das Programm an im Hintergrund\n" - " echo Zeigt an\n" - "\n" - " pwd Zeigt den aktuellen Verzeichnisnamen an\n" - " ls Zeigt den Verzeichnisinhalt an\n" - " stat Zeigt Informationen zur einer Datei an\n" - " cd Wechselt das Verzeichnis\n" - " mkdir Erstellt das Verzeichnis\n" - "\n" - " cp Kopiert die Datei nach \n" - " ln Erstellt einen auf verweisenden Link \n" - " symlink Erstellt einen symbolischen Link auf \n" - " readlink Liest das Ziel des Symlinks aus\n" - " rm Löscht eine Datei\n" - "\n" - " cat Zeigt den Inhalt der Datei an\n" - " bincat Zeigt den Inhalt der Datei als einzelne Bytes an\n" - " pipe Ein-/Ausgabe auf einer Datei (z.B. TCP-Verbindung)\n" - " sync Alle veränderten Blöcke im Cache zurückschreiben\n" - "\n" - " date Zeigt das Datum und die Uhrzeit an\n" - " free Zeigt den Speicherverbrauch des Systems an\n" - " ps Zeigt eine Liste mit allen Prozessen an\n" - " pstree Zeigt die Prozesshierarchie als Baum an\n" - " kill Beendet den Prozess \n" - " dbg_st Zeigt einen Stack Backtrace des Prozesses an\n" - - " set Setzt Umgebungsvariablen oder zeigt sie an\n" - " read Liest einen Wert für die Umgebungsvariable ein\n" - " source Führt das Skript in der aktuellen Shell aus\n" - " sleep Wartet Sekunden\n" - - " exit Beendet die Shell\n" - "\n" - "Diese Hilfe wird in den meisten Fällen nicht auf den Bildschirm" - " passen. Um\n" - "weiter oben stehende Befehle anzuzeigen, bitte Shift-BildAuf" - " drücken.\n" - "Shift-BildAb blättert wieder nach unten. Andere Tasten springen" - " zurück an die\n" - "aktuelle Position.\n" - "\n" - )); - - return 0; -} - -/** - * - */ -int shell_command_version(int argc, char* argv[], const char* args) -{ - puts("tyndur Shell " TYNDUR_VERSION); - return 0; -} - -/** - * - */ -int shell_command_exit(int argc, char* argv[], const char* args) -{ - exit(0); - return 0; -} - -int shell_command_cd(int argc, char* argv[], const char* args) -{ - char* cd_args = strchr(args, ' '); - char* path; - DIR* dir; - - if (cd_args == NULL) { - goto usage; - } - - cd_args++; - path = io_get_absolute_path(cd_args); - if (path == NULL) { - goto usage; - } - - dir = opendir(path); - if (dir == NULL) { - printf(TMS(cd_error, "Wechseln in das Verzeichnis '%s' " - "nicht möglich!\n"), path); - } else { - chdir(path); - closedir(dir); - } - free(path); - - return 0; - -usage: - puts(TMS(cd_usage, "\nAufruf: cd ")); - return -1; -} - -int shell_command_source(int argc, char* argv[], const char* args) -{ - const char* path; - if (argc != 2) { - printf(TMS(source_usage, "\nAufruf: source \n")); - return -1; - } - - path = argv[1]; - if (shell_script(path)) { - return 0; - } else { - printf(TMS(source_error, "Ausführen des Skripts '%s' " - "fehlgeschlagen.\n"), path); - return -1; - } -} - -int shell_command_clear(int argc, char* argv[], const char* args) -{ - printf("\033[1;1H\033[2J"); - - return 0; -} - -void set_display_usage(void); -void set_list_vars(void); - -int shell_command_set(int argc, char* argv[], const char* args) -{ - int overwrite = 1; - - while (argc > 1) { - if (!strcmp(argv[1], "-d")) { - overwrite = 0; - } else if (!strcmp(argv[1], "-h")) { - set_display_usage(); - return EXIT_SUCCESS; - } else { - break; - } - argc--; - argv++; - } - - switch (argc) { - case 1: - set_list_vars(); - break; - - case 2: - unsetenv(argv[1]); - break; - - case 3: - setenv(argv[1], argv[2], overwrite); - break; - - default: - set_display_usage(); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - -void set_list_vars() -{ - int i, cnt; - - cnt = getenv_count(); - for (i = 0; i < cnt; i++) { - printf("%s = %s\n", getenv_name_by_index(i), getenv_index(i)); - } -} - -void set_display_usage() -{ - puts(TMS(set_usage, "\nAufruf: set [-d] [ []]\n\n" - "Optionen:\n" - " -d: Defaultwert setzen. Wenn die Variable schon gesetzt ist, wird " - "ihr Wert\n nicht geändert.\n")); -} - -- 1.7.9.6 From m.nemo at gmx.net Sun Apr 8 12:38:39 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 12:38:39 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/4=5D_build=3A_das_root-Makefi?= =?utf-8?q?le_nicht_mehr_auto-generieren?= In-Reply-To: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> References: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> Message-ID: <1333881521-6881-2-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- buildmk.sh | 98 ++++++------------------------------------------------------ 1 file changed, 9 insertions(+), 89 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index 7382712..7da50d9 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -98,17 +98,18 @@ EOF else echo GRUB_VERSION=grub2 >> Makefile.local fi -fi -# Nur die Unterverzeichnisse nutzen den absoluten Pfad zu Makefile.local, um -# Änderungen am Makefile im Wurzelverzeichnis zu verhindern -if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then - echo "-include Makefile.local" > Makefile -else - echo "-include $LOST_BUILDMK_ROOT/Makefile.local" > Makefile + for dir in doc src; do + cd $dir + bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" + cd .. + done + + exit 0 fi -cat <> Makefile +cat < Makefile +-include $LOST_BUILDMK_ROOT/Makefile.local CC=\$(CC_BINARY) $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND CPP=\$(CPP_BINARY) $INCLUDES @@ -270,84 +271,3 @@ clean: clean_objs .SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF - -if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then -cat <> Makefile -.PHONY: lbuilds-env - -# Code für lbuilds -lbuilds-env: - if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi - touch lbuilds/.nobuild - cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include - make enable-pascal - \$(MAKE) - cd lbuilds && scripts/update_env .. - -enable-pascal: - touch src/modules/pas/.ignorenobuild - -disable-pascal: - rm -f src/modules/pas/.ignorenobuild - -clean: clean_root - -clean_root: - rm -rf build/images/* build/root/* - rm -f build/output/apps/* build/output/modules/* build/output/kernel/* build/output/gz/*/* - rm -f qemu-serial.log - -updateroot: subdirs - build/scripts/updateroot - -image-floppy: updateroot - build/scripts/image_floppy_\$(GRUB_VERSION) - -image-hd: updateroot - build/scripts/image_hd_\$(GRUB_VERSION) - -image-cdrom: updateroot - build/scripts/image_cdrom_\$(GRUB_VERSION) - -test-qemu-floppy: image-floppy - $LOST_TOOLS_QEMU -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log - -test-qemu-hd: image-hd - $LOST_TOOLS_QEMU -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log - -test-qemu-cdrom: image-cdrom - $LOST_TOOLS_QEMU -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log - -test-bochs: image-floppy - bochs -f bochs.config - -cscope: - rm -f cscope.* - find \`pwd\`/src -name '*.[ch]' > cscope.files - cscope -bk - -menuconfig: - python config.py - -documentation: - test -d doc/doxygen || mkdir doc/doxygen - test -d doc/doxygen/modules || mkdir doc/doxygen/modules - test -d doc/doxygen/kernel || mkdir doc/doxygen/kernel - rm -R doc/doxygen/modules/* - rm -R doc/doxygen/kernel/* - doxygen doxyfile_modules - doxygen doxyfile_kernel - -bugreport: - mkdir bugreport - gcc -v 2> bugreport/gcc.version - nasm -v > bugreport/nasm.version - ld -v > bugreport/ld.version - - cp build/*.mod bugreport/ - cp build/*.krn bugreport/ - - tar cjf bugreport.tar.bz2 bugreport - rm -rf bugreport -EOF -fi -- 1.7.9.3 From m.nemo at gmx.net Sun Apr 8 12:38:38 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 12:38:38 +0200 Subject: [tyndur-devel] =?utf-8?b?W1BBVENIIDEvNF0gYnVpbGQ6IMO8YmVyZmzDvHNz?= =?utf-8?q?ige_Leerzeichen_entfernt?= Message-ID: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- buildmk.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index 70ebb1c..7382712 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (c) 2006 The tyndur Project. All rights reserved. -# +# # This code is derived from software contributed to the tyndur Project # by Kevin Wolf. # @@ -21,16 +21,16 @@ # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. shopt -s extglob @@ -128,7 +128,7 @@ if [ "`pwd | grep '/src/kernel2'`" == "" ]; then cat <> Makefile \$(MAKE) --no-print-directory -s makefiles \$(MAKE) --no-print-directory -s subdirs - \$(MAKE) --no-print-directory -s obj + \$(MAKE) --no-print-directory -s obj EOF else cat <> Makefile @@ -206,13 +206,13 @@ for file in *.c *.cpp *.asm *.pas *.S; do *.c) echo ${file%.c}.o: $file >> Makefile echo -e \\techo "'CC $file: $CC'" >> Makefile - + echo -e \\t\$\(CC\) $file >> Makefile ;; *.cpp) echo ${file%.cpp}.o: $file >> Makefile echo -e \\techo "'CPP $file: $CPP'" >> Makefile - + echo -e \\t\$\(CPP\) $file >> Makefile ;; @@ -230,7 +230,7 @@ for file in *.c *.cpp *.asm *.pas *.S; do ;; *.pas) echo ${file%.pas}.o: $file >> Makefile - + echo -e \\techo "'PPC $file'" >> Makefile if [ "$file" == "system.pas" ]; then echo -e \\t\$\(PPC\) -Us -Fiinclude/inc/ -Fiinclude/i386/ -Fiinclude/common/ $file >> Makefile @@ -241,7 +241,7 @@ for file in *.c *.cpp *.asm *.pas *.S; do *.S) echo ${file%.S}.o: $file >> Makefile echo -e \\techo "'AS $file: $AS'" >> Makefile - + echo -e \\t\$\(AS\) -o ${file%.S}.o $file >> Makefile ;; esac -- 1.7.9.3 From m.nemo at gmx.net Sun Apr 8 12:38:41 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 12:38:41 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_4/4=5D_build=3A_buildmk=2Esh_pa?= =?utf-8?q?rallel_in_allen_Unterverzeichnissen_ausf=C3=BChren?= In-Reply-To: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> References: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> Message-ID: <1333881521-6881-4-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- buildmk.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildmk.sh b/buildmk.sh index 2a95f74..82d5805 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -175,6 +175,7 @@ if [ "$FILES" != "" ]; then fi echo obj: $PWDLINE $FILES >> Makefile +SUB_PROCES_IDS="" # Unterverzeichnisse von src rekursiv durchsuchen echo >> Makefile @@ -191,11 +192,13 @@ for file in lib rtl !(lib|rtl|arch) arch; do # echo -e \\tmake -C "$file" '| (grep -vE "^(make|if)" || true)' >> Makefile cd $file - bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" + bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" & + SUB_PROCESS_IDS="$! $SUB_IDS" cd .. fi done + # Kompilieren der Quellcode-Dateien for file in *.c *.cpp *.asm *.pas *.S; do if [ -f $file ]; then @@ -268,3 +271,5 @@ clean: clean_objs .SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF + +wait $SUB_PROCES_IDS -- 1.7.9.3 From m.nemo at gmx.net Sun Apr 8 12:38:40 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 12:38:40 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_3/4=5D_build=3A_nur_noch_=C3=BC?= =?utf-8?q?bersprungene_Makefiles_anzeigen?= In-Reply-To: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> References: <1333881521-6881-1-git-send-email-m.nemo@gmx.net> Message-ID: <1333881521-6881-3-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- buildmk.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index 7da50d9..2a95f74 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -181,15 +181,12 @@ echo >> Makefile echo subdirs: >> Makefile for file in lib rtl !(lib|rtl|arch) arch; do if [ -d "$file" ]; then - if [ "$file" == "include" -o \( -f "$file/.nobuild" -a ! -f "$file/.ignorenobuild" \) ]; then - echo Ueberspringe `pwd`/$file/Makefile + if [ "$file" == "include" -o \( -f "$file/.nobuild" -a ! -f "$file/.ignorenobuild" \) ] || + [ "`basename \`pwd\``" == "arch" ] && [ "$file" != "$LOST_ARCH" ]; then + echo Überspringe `pwd`/$file/ continue fi - if [ "`basename \`pwd\``" == "arch" ] && [ "$file" != "$LOST_ARCH" ]; then - echo Ueberspringe `pwd`/$file/Makefile - continue - fi - echo Erzeuge `pwd`/$file/Makefile +# echo Erzeuge `pwd`/$file/Makefile echo -e "\\t\$(MAKE)" --no-print-directory -sC "$file" >> Makefile # echo -e \\tmake -C "$file" '| (grep -vE "^(make|if)" || true)' >> Makefile -- 1.7.9.3 From m.nemo at gmx.net Sun Apr 8 13:02:08 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 13:02:08 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_v2=5D_build=3A_buildmk=2Esh_par?= =?utf-8?q?allel_in_allen_Unterverzeichnissen_ausf=C3=BChren?= In-Reply-To: <1333881521-6881-4-git-send-email-m.nemo@gmx.net> References: <1333881521-6881-4-git-send-email-m.nemo@gmx.net> Message-ID: <1333882928-20710-1-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- Zu meiner Verteidigung... Ich hatte das geteste. Und es lief.. sogar mit den drei unterschiedlichen Schreibweisen für SUB_PROCESS_IDS buildmk.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildmk.sh b/buildmk.sh index 2a95f74..a97c324 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -175,6 +175,7 @@ if [ "$FILES" != "" ]; then fi echo obj: $PWDLINE $FILES >> Makefile +SUB_PROCESS_IDS="" # Unterverzeichnisse von src rekursiv durchsuchen echo >> Makefile @@ -191,11 +192,13 @@ for file in lib rtl !(lib|rtl|arch) arch; do # echo -e \\tmake -C "$file" '| (grep -vE "^(make|if)" || true)' >> Makefile cd $file - bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" + bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" & + SUB_PROCESS_IDS="$! $SUB_PROCESS_IDS" cd .. fi done + # Kompilieren der Quellcode-Dateien for file in *.c *.cpp *.asm *.pas *.S; do if [ -f $file ]; then @@ -268,3 +271,5 @@ clean: clean_objs .SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF + +wait $SUB_PROCESS_IDS -- 1.7.9.3 From m.nemo at gmx.net Sun Apr 8 13:23:44 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 8 Apr 2012 13:23:44 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_v3=5D_build=3A_buildmk=2Esh_par?= =?utf-8?q?allel_in_allen_Unterverzeichnissen_ausf=C3=BChren?= In-Reply-To: <1333882928-20710-1-git-send-email-m.nemo@gmx.net> References: <1333882928-20710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1333884224-21257-1-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- OK. Funktioniert hatte es weil man die Prozess IDs garnicht braucht. buildmk.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildmk.sh b/buildmk.sh index 2a95f74..96044f3 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -191,7 +191,7 @@ for file in lib rtl !(lib|rtl|arch) arch; do # echo -e \\tmake -C "$file" '| (grep -vE "^(make|if)" || true)' >> Makefile cd $file - bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" + bash $LOST_BUILDMK_ROOT/buildmk.sh "$INCLUDES" "$LIBDIRS" & cd .. fi done @@ -268,3 +268,6 @@ clean: clean_objs .SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF + +# Auf alle Unterprozesse warten +wait -- 1.7.9.3 From kevin at tyndur.org Mon Apr 9 15:30:17 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 9 Apr 2012 15:30:17 +0200 Subject: [tyndur-devel] =?utf-8?b?W1BBVENIXSBzaGVsbDogY29tbV9tX2FuZHMuYyB2?= =?utf-8?b?ZXJu77+9bmZ0aWcgZ2Vs77+9c2NodA==?= In-Reply-To: <1333550296-27791-1-git-send-email-hartmut@tyndur.org> References: <1333550296-27791-1-git-send-email-hartmut@tyndur.org> Message-ID: <20120409133017.GA8432@silvanus> On Wed, Apr 04, 2012 at 04:38:16PM +0200, Alexander Kluth wrote: > git rm commmands.c, da die Datei bei mir sonst drin blieb > > Signed-off-by: Alexander Kluth Zumindest master hat keine commands.c, also entfernt das hier eine Datei ersatzlos und macht die Shell kaputt. From kevin at tyndur.org Mon Apr 9 15:44:43 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 9 Apr 2012 15:44:43 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_v3=5D_build=3A_buildmk=2Es?= =?iso-8859-1?q?h_parallel_in_allen_Unterverzeichnissen_ausf=FChren?= In-Reply-To: <1333884224-21257-1-git-send-email-m.nemo@gmx.net> References: <1333882928-20710-1-git-send-email-m.nemo@gmx.net> <1333884224-21257-1-git-send-email-m.nemo@gmx.net> Message-ID: <20120409134443.GB8432@silvanus> On Sun, Apr 08, 2012 at 01:23:44PM +0200, Andreas Freimuth wrote: > Signed-off-by: Andreas Freimuth > --- > > OK. Funktioniert hatte es weil man die Prozess IDs garnicht braucht. Warum einfach, wenn es auch kompliziert geht? ;-) Danke, ich hab alle vier Patches gepusht. Falls es jemanden interessiert, das parallele Bauen bringt mich von 9s für ein make makefiles auf 6,5s runter. Immerhin. Kevin From kevin at tyndur.org Mon Apr 9 17:42:48 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 9 Apr 2012 17:42:48 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_1/2=5D_ftp=3A_fix_behandlu?= =?iso-8859-1?q?ng_von_Servermeldungen_mit_=DCberlangen_Zeilen?= In-Reply-To: <1301929939-32132-1-git-send-email-m.nemo@gmx.net> References: <1301929939-32132-1-git-send-email-m.nemo@gmx.net> Message-ID: <20120409154248.GC8432@silvanus> On Mon, Apr 04, 2011 at 05:12:18PM +0200, Andreas Freimuth wrote: > ! ftp.c/response: kann jetzt auch mit Zeilen länger als LINE_LENGTH > umgehen > > Signed-off-by: Andreas Freimuth > --- > src/modules/c/ftp/ftp.c | 64 +++++++++++++++++++++------------------------- > 1 files changed, 29 insertions(+), 35 deletions(-) Noch ein Uraltpatch, der bisher nicht committet worden ist... Auf den ersten Blick sieht er vernünftig aus, allerdings ist hier noch irgendwas kaputt. Wenn ich mich testweise auf ftp.debian.org einlogge und ein ls mache, gibt es rot. Kevin From kevin at tyndur.org Mon Apr 9 18:11:27 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 9 Apr 2012 18:11:27 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_1/2=5D_ftp=3A_fix_behandlu?= =?iso-8859-1?q?ng_von_Servermeldungen_mit_=DCberlangen_Zeilen?= In-Reply-To: <20120409154248.GC8432@silvanus> References: <1301929939-32132-1-git-send-email-m.nemo@gmx.net> <20120409154248.GC8432@silvanus> Message-ID: <20120409161127.GD8432@silvanus> On Mon, Apr 09, 2012 at 05:42:48PM +0200, Kevin Wolf wrote: > On Mon, Apr 04, 2011 at 05:12:18PM +0200, Andreas Freimuth wrote: > > ! ftp.c/response: kann jetzt auch mit Zeilen länger als LINE_LENGTH > > umgehen > > > > Signed-off-by: Andreas Freimuth > > --- > > src/modules/c/ftp/ftp.c | 64 +++++++++++++++++++++------------------------- > > 1 files changed, 29 insertions(+), 35 deletions(-) > > Noch ein Uraltpatch, der bisher nicht committet worden ist... Auf den > ersten Blick sieht er vernünftig aus, allerdings ist hier noch irgendwas > kaputt. Wenn ich mich testweise auf ftp.debian.org einlogge und ein ls > mache, gibt es rot. Das Problem ist, dass der Patch nicht berücksichtigt, dass fgets() unter tyndur nicht blockiert, bis es eine komplette Zeile gelesen hat, sondern nur das zurückliefert, was schon angekommen ist.