Made everything compile under a proper name.

git-svn-id: https://codelite.svn.sourceforge.net/svnroot/codelite/trunk@1022 9da81c78-c036-0410-9e1f-a2b0375e4b5a
eranif · Jan 29, 2008 · b08f865 · b08f865
1 parent bfe8a6b
commit b08f865
Show file tree

Hide file tree

Showing 9 changed files with 2,488 additions and 27 deletions.
diff --git a/MakefileParser/Parser.project b/MakefileParser/Parser.project
@@ -1,37 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CodeLite_Project Name="Parser">
-  <Dependencies/>
   <VirtualDirectory Name="src">
     <File Name="main.cpp"/>
     <File Name="MakefileParser.cpp"/>
     <File Name="Target.cpp"/>
     <File Name="TargetLexer.cpp"/>
-    <File Name="VariableLexer.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="grammar">
-    <File Name="variable.y"/>
-    <File Name="variable.l"/>
+    <File Name="makefile_parser.y"/>
+    <File Name="makefile_parser.l"/>
+  </VirtualDirectory>
+  <VirtualDirectory Name="UI"/>
+  <VirtualDirectory Name="include">
+    <File Name="LineTypes.h"/>
+    <File Name="MakefileParser.h"/>
+    <File Name="Target.h"/>
+    <File Name="TargetLexer.h"/>
+  </VirtualDirectory>
+  <VirtualDirectory Name="MakefileParser">
+    <File Name="makefile_lexer.cpp"/>
+    <File Name="makefile_lexer.h"/>
+    <File Name="makefile_parser.cpp"/>
   </VirtualDirectory>
   <Settings Type="Executable">
-    <Configuration Name="Debug" CompilerType="gnu g++">
+    <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger">
       <General OutputFile="./Debug/HelloWorld" IntermediateDirectory="./Debug" Command="HelloWorld" CommandArguments="" WorkingDirectory="./Debug"/>
-      <Compiler Required="yes" Options="-g">
+      <Compiler Required="yes" Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes);">
         <IncludePath Value="."/>
+        <IncludePath Value="../CodeLite"/>
       </Compiler>
-      <Linker Required="yes" Options="-O0">
+      <Linker Required="yes" Options="$(shell wx-config --debug=yes --libs --unicode=yes);">
         <LibraryPath Value="."/>
         <LibraryPath Value="./Debug"/>
+        <LibraryPath Value="../lib/gcc_lib/"/>
+        <Library Value="libCodeLiteud.a"/>
       </Linker>
-      <PreBuild>
-        <Command Enabled="yes">yacc -dl  -t variable.y</Command>
-        <Command Enabled="yes">flex -L  variable.l</Command>
-        <Command Enabled="yes">mv lex.yy.c variable.lex.cpp</Command>
-        <Command Enabled="yes">mv y.tab.c variable.tab.cpp</Command>
-        <Command Enabled="yes">mv y.tab.h variable.tab.h</Command>
-      </PreBuild>
+      <ResourceCompiler Required="no" Options=""/>
+      <PreBuild/>
       <PostBuild/>
+      <CustomBuild Enabled="no">
+        <CleanCommand/>
+        <BuildCommand/>
+        <WorkingDirectory/>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild>makefile_parser.cpp makefile_lexer.cpp
+makefile_parser.cpp: makefile_parser.y
+	yacc -dl  -t -v -pclplugin_scope_ makefile_parser.y
+	mv y.tab.c makefile_parser.cpp
+	mv y.tab.h makefile_lexer.h
+
+makefile_lexer.cpp: makefile_parser.l
+	flex -L  -Pclplugin_scope_ makefile_parser.l
+	mv lex.clplugin_scope_.c makefile_lexer.cpp
+</CustomPreBuild>
+      </AdditionalRules>
     </Configuration>
-    <Configuration Name="Release" CompilerType="GNU g++">
+    <Configuration Name="Release" CompilerType="GNU g++" DebuggerType="">
       <General OutputFile="./Release/HelloWorld" IntermediateDirectory="./Release" Command="HelloWorld" CommandArguments="" WorkingDirectory="./Release"/>
       <Compiler Required="yes" Options="-O2">
         <IncludePath Value="."/>
@@ -40,17 +66,19 @@
         <LibraryPath Value="."/>
         <LibraryPath Value="./Release"/>
       </Linker>
+      <ResourceCompiler Required="yes" Options=""/>
       <PreBuild/>
       <PostBuild/>
+      <CustomBuild Enabled="no">
+        <CleanCommand/>
+        <BuildCommand/>
+        <WorkingDirectory/>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
+      </AdditionalRules>
     </Configuration>
   </Settings>
-  <VirtualDirectory Name="UI"/>
-  <VirtualDirectory Name="include">
-    <File Name="LineTypes.h"/>
-    <File Name="MakefileParser.h"/>
-    <File Name="Target.h"/>
-    <File Name="TargetLexer.h"/>
-    <File Name="VariableLexer.h"/>
-  </VirtualDirectory>
-  <VirtualDirectory Name="MakefileParser"/>
+  <Dependencies/>
 </CodeLite_Project>
diff --git a/MakefileParser/VariableLexer.cpp b/MakefileParser/VariableLexer.cpp
@@ -1,4 +1,4 @@
-#include "variable.tab.h"
+#include "makefile_lexer.h"
 #include "VariableLexer.h"
 #include <string>
 #include <vector>
@@ -9,6 +9,8 @@
 
 void initLexer(const char *filename);
 
+#define YYSTYPE wxString
+
 YYSTYPE yyparse();
 
 typedef wxArrayString Strings;

diff --git a/MakefileParser/main.cpp b/MakefileParser/main.cpp
@@ -1,4 +1,4 @@
-#include "variable.tab.h"
+#include "makefile_lexer.h"
 #include <stdio.h>
 #include <map>
 #include <wx/string.h>
@@ -7,6 +7,9 @@
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
+#define YYSTYPE wxString
+#define yyparse clplugin_scope_parse
+
 void initLexer(const char *filename);
 
 //std::string yyparse();

diff --git a/MakefileParser/Makefile → MakefileParser/makefile.custom b/MakefileParser/Makefile → MakefileParser/makefile.custom