summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-03-17 20:32:54 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-03-17 20:32:54 (GMT)
commitb1800e6e8923c5a1eeefb136103811135d5813bf (patch)
tree5c9d2280ca0cb07840bfa26ca4dbed5b3225d21f /src/config.l
parentcff8111ed33af6033bd188868964d92ea3503188 (diff)
downloadDoxygen-b1800e6e8923c5a1eeefb136103811135d5813bf.zip
Doxygen-b1800e6e8923c5a1eeefb136103811135d5813bf.tar.gz
Doxygen-b1800e6e8923c5a1eeefb136103811135d5813bf.tar.bz2
Release-1.8.0
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/config.l b/src/config.l
index 2988810..5dfbae3 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,7 +1,5 @@
/******************************************************************************
*
- *
- *
* Copyright (C) 1997-2012 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
@@ -872,12 +870,13 @@ void Config::convertStrToVal()
static void substEnvVarsInString(QCString &s)
{
- static QRegExp re("\\$\\([a-z_A-Z0-9]+\\)");
+ static QRegExp re("\\$\\([a-z_A-Z0-9.-]+\\)");
+ static QRegExp re2("\\$\\([a-z_A-Z0-9.-]+\\([a-z_A-Z0-9.-]+\\)\\)"); // For e.g. PROGRAMFILES(X86)
if (s.isEmpty()) return;
int p=0;
int i,l;
//printf("substEnvVarInString(%s) start\n",s.data());
- while ((i=re.match(s,p,&l))!=-1)
+ while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1)
{
//printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
QCString env=portable_getenv(s.mid(i+2,l-3));
@@ -1473,7 +1472,8 @@ void Config::check()
(Config_getBool("INLINE_INHERITED_MEMB") ||
Config_getBool("INHERIT_DOCS") ||
!Config_getBool("HIDE_SCOPE_NAMES") ||
- !Config_getBool("EXTRACT_PRIVATE")
+ !Config_getBool("EXTRACT_PRIVATE") ||
+ !Config_getBool("EXTRACT_PACKAGE")
)
)
{
@@ -1482,15 +1482,18 @@ void Config::check()
bool b3 = Config_getBool("HIDE_SCOPE_NAMES");
bool b4 = Config_getBool("EXTRACT_PRIVATE");
bool b5 = Config_getBool("SKIP_FUNCTION_MACROS");
- const char *s1,*s2,*s3,*s4,*s5;
+ bool b6 = Config_getBool("EXTRACT_PACKAGE");
+ const char *s1,*s2,*s3,*s4,*s5,*s6;
if (b1) s1=" INLINDE_INHERITED_MEMB = NO (was YES)\n"; else s1="";
if (b2) s2=" INHERIT_DOCS = NO (was YES)\n"; else s2="";
if (!b3) s3=" HIDE_SCOPE_NAMES = YES (was NO)\n"; else s3="";
if (!b4) s4=" EXTRACT_PRIVATE = YES (was NO)\n"; else s4="";
if (b5) s5=" ENABLE_PREPROCESSING = NO (was YES)\n"; else s5="";
+ if (!b6) s6=" EXTRACT_PACKAGE = YES (was NO)\n"; else s6="";
+
config_err("warning: enabling OPTIMIZE_OUTPUT_VHDL assumes the following settings:\n"
- "%s%s%s%s%s",s1,s2,s3,s4,s5
+ "%s%s%s%s%s%s",s1,s2,s3,s4,s5,s6
);
Config_getBool("INLINE_INHERITED_MEMB") = FALSE;
@@ -1498,6 +1501,7 @@ void Config::check()
Config_getBool("HIDE_SCOPE_NAMES") = TRUE;
Config_getBool("EXTRACT_PRIVATE") = TRUE;
Config_getBool("ENABLE_PREPROCESSING") = FALSE;
+ Config_getBool("EXTRACT_PACKAGE") = TRUE;
}
}