[mapserver-commits] r10064 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-04-07 07:56:48 -0400 (Wed, 07 Apr 2010)
New Revision: 10064

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/Makefile.in
   trunk/mapserver/maplexer.l
Log:
we will no longer automatically rebuild maplexer.c (#2310)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-04-07 02:18:46 UTC (rev 10063)
+++ trunk/mapserver/HISTORY.TXT	2010-04-07 11:56:48 UTC (rev 10064)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Avoid automatically regenerating maplexer.c (#2310)
+
 - Change rounding rules for average resampling (#1932)
 
 - Implement support for filename encryption per RFC 18 for rasters (#3416)

Modified: trunk/mapserver/Makefile.in
===================================================================
--- trunk/mapserver/Makefile.in	2010-04-07 02:18:46 UTC (rev 10063)
+++ trunk/mapserver/Makefile.in	2010-04-07 11:56:48 UTC (rev 10064)
@@ -279,6 +279,17 @@
 #
 all: $(MAKE_GD) libmapserver.a $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ 
 
+# Explicitly invoke this rule when maplexer.l is altered.  We don't do
+# it automatically for the reasons listed in #2310
+
+lexer:
+	$(LEX) --nounistd -Pmsyy -i -omaplexer.c maplexer.l
+
+maplexer.c:	maplexer.l
+	@echo '----------------------------------------------------------------'
+	@echo '--  Please run "make lexer" if you have altered maplexer.l     -'
+	@echo '----------------------------------------------------------------'
+
 #
 # Non-gnumake's don't seem to use this pattern rule, 
 # but have a similar built-in rule for C code.  So try not
@@ -311,9 +322,6 @@
 
 maplexer.o: maplexer.c mapserver.h mapfile.h
 
-maplexer.c: maplexer.l
-	$(LEX) --nounistd -Pmsyy -i -omaplexer.c maplexer.l
-
 mapparser.o: mapparser.c mapserver.h
 
 mapparser.c: mapparser.y

Modified: trunk/mapserver/maplexer.l
===================================================================
--- trunk/mapserver/maplexer.l	2010-04-07 02:18:46 UTC (rev 10063)
+++ trunk/mapserver/maplexer.l	2010-04-07 11:56:48 UTC (rev 10064)
@@ -1,4 +1,13 @@
 %{
+/*
+** READ ME FIRST!
+**
+** When this file is altered, it is necessary to do "make lexer".  Due to
+** problems detailed in #2310 the lexer is no longer automatically rebuilt
+** when maplexer.l is altered.
+*/
+
+
 /* C declarations */
 #include <stdlib.h>
 #include <stdio.h>