Date: Fri, 5 Sep 2003 14:36:58 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 37589 for review Message-ID: <200309052136.h85LawGu062476@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=37589 Change 37589 by peter@peter_daintree on 2003/09/05 14:36:45 Check in jdp's patches in the 1.1 port. I believe these are ezm3-1.1a Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 (text+ko) ==== @@ -690,8 +690,8 @@ -e 's|%% *|../|g' \ -e 's|%||g' SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \ - "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \ - "STAGE_PREFIX=`echo @quoted_stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" + "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" + # # Lists of files for various purposes. ==== //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 (text+ko) ==== @@ -303,9 +303,10 @@ m3_template := Env.Get("M3_TEMPLATE_DIR"); path : TEXT; subpath : TEXT; - nextsep : INTEGER := 0; - prevsep : INTEGER := 0; + nextsep : INTEGER; + prevsep : INTEGER := -1; sep : CHAR; + filename : TEXT; BEGIN IF m3_template # NIL THEN template_dir := m3_template; @@ -322,13 +323,17 @@ REPEAT nextsep := Text.FindChar(path, sep, prevsep + 1); IF nextsep # -1 THEN - subpath := Text.Sub(path, prevsep, nextsep - prevsep - 1); + subpath := Text.Sub(path, prevsep + 1, nextsep - prevsep - 1); ELSE - subpath := Text.Sub(path, prevsep); + subpath := Text.Sub(path, prevsep + 1); END; - IF M3File.IsReadable(subpath & template) THEN - template_dir := subpath; - RETURN; + IF Text.Length(subpath) > 0 THEN + filename := subpath & SL & template; + IF M3File.IsReadable(filename) AND + NOT M3File.IsDirectory(filename) THEN + template_dir := subpath; + RETURN; + END; END; prevsep := nextsep; UNTIL prevsep = -1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309052136.h85LawGu062476>