[anjuta] am-project: bgo #670789 - project-manager doesn't parse aqbanking project correctly



commit a75d56c5aa4b3e89e7325f994289d227ee490ef3
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sat Mar 3 16:00:29 2012 +0100

    am-project: bgo #670789 - project-manager doesn't parse aqbanking project correctly
    
    The added test case checks the case that was triggering a syntax error in aqbanking project.

 plugins/am-project/am-parser.y   |   49 +++++++++++++++++++------------------
 plugins/am-project/tests/bugs.at |   25 +++++++++++++++++++
 2 files changed, 50 insertions(+), 24 deletions(-)
---
diff --git a/plugins/am-project/am-parser.y b/plugins/am-project/am-parser.y
index f1a3bd1..f7c5b50 100644
--- a/plugins/am-project/am-parser.y
+++ b/plugins/am-project/am-parser.y
@@ -486,6 +486,7 @@ not_eol_token:
 
 prerequisite_token:
 	name_token
+	| automake_token
 	| equal_token
 	| rule_token
 	;
@@ -575,30 +576,30 @@ automake_token:
 	| _SCRIPTS
 	| _SOURCES
 	| _TEXINFOS
-	|  _DIR
-	|  _LDFLAGS
-	|  _CPPFLAGS
-	|  _CFLAGS
-	|  _CXXFLAGS
-	|  _JAVACFLAGS
-	|  _VALAFLAGS
-	|  _FCFLAGS
-	|  _OBJCFLAGS
-	|  _LFLAGS
-	|  _YFLAGS
-	|  TARGET_LDFLAGS
-	|  TARGET_CPPFLAGS
-	|  TARGET_CFLAGS
-	|  TARGET_CXXFLAGS
-	|  TARGET_JAVACFLAGS
-	|  TARGET_VALAFLAGS
-	|  TARGET_FCFLAGS
-	|  TARGET_OBJCFLAGS
-	|  TARGET_LFLAGS
-	|  TARGET_YFLAGS
-	|  TARGET_DEPENDENCIES
-	|  TARGET_LIBADD
-	|  TARGET_LDADD
+	| _DIR
+	| _LDFLAGS
+	| _CPPFLAGS
+	| _CFLAGS
+	| _CXXFLAGS
+	| _JAVACFLAGS
+	| _VALAFLAGS
+	| _FCFLAGS
+	| _OBJCFLAGS
+	| _LFLAGS
+	| _YFLAGS
+	| TARGET_LDFLAGS
+	| TARGET_CPPFLAGS
+	| TARGET_CFLAGS
+	| TARGET_CXXFLAGS
+	| TARGET_JAVACFLAGS
+	| TARGET_VALAFLAGS
+	| TARGET_FCFLAGS
+	| TARGET_OBJCFLAGS
+	| TARGET_LFLAGS
+	| TARGET_YFLAGS
+	| TARGET_DEPENDENCIES
+	| TARGET_LIBADD
+	| TARGET_LDADD
 	;
 
 include_token:
diff --git a/plugins/am-project/tests/bugs.at b/plugins/am-project/tests/bugs.at
index 6f2c0ec..7bac5b3 100644
--- a/plugins/am-project/tests/bugs.at
+++ b/plugins/am-project/tests/bugs.at
@@ -47,4 +47,29 @@ AT_CHECK([diff output expect])
 
 
 
+AS_MKDIR_P([project3])
+AT_DATA([project3/configure.ac],
+[[
+AC_CONFIG_FILES(Makefile)
+]])
+AT_DATA([project3/Makefile.am],
+[[
+ALL_LINGUAS = $(notdir *.po)
+
+catalogs: $(ALL_LINGUAS)
+        $(ALL_LINGUAS)
+
+noinst_PROGRAMS = program
+]])
+AT_DATA([expect],
+[[ROOT (): project3
+    TARGET (): program
+        PROPERTY (Do not install): true
+]])
+AT_PARSER_CHECK([load project3 \
+		 list])
+AT_CHECK([diff output expect])
+
+
+
 AT_CLEANUP



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]