HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

real installation of edn software in /usr/bin and /usr/shared/edn/...

Browse Source
This commit is contained in:
Edouard Dupin 2011-08-01 09:17:01 +02:00
parent 83f1e2e5b5
commit 7b476ebc49
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -290,11 +290,11 @@ install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE)
@echo $(F_ROUGE)" (stripped) $(OUTPUT_NAME_RELEASE) => $(PROG_NAME) "$(F_NORMALE) @echo $(F_ROUGE)" (stripped) $(OUTPUT_NAME_RELEASE) => $(PROG_NAME) "$(F_NORMALE)
@cp $(OUTPUT_NAME_RELEASE) $(PROG_NAME) @cp $(OUTPUT_NAME_RELEASE) $(PROG_NAME)
@strip -s $(PROG_NAME) @strip -s $(PROG_NAME)
@echo $(F_VERT)" (copy) $(PROG_NAME) ~/.bin/ "$(F_NORMALE) @echo $(F_VERT)" (copy) $(PROG_NAME) /usr/bin/ "$(F_NORMALE)
@cp -vf $(PROG_NAME) ~/.bin/ @cp -vf $(PROG_NAME) /usr/bin/
@echo $(F_VERT)" (data) data/* ==> ~/.edn/data/ "$(F_NORMALE) @echo $(F_VERT)" (data) data/* ==> /usr/share/edn/ "$(F_NORMALE)
@mkdir -p ~/.edn/data @mkdir -p /usr/share/edn/
@cp -vf data/*.xml ~/.edn/data @cp -vf data/*.xml /usr/share/edn/

17
Sources/Highlight/HighlightManager.cpp
View File

@ -68,39 +68,38 @@ void HighlightManager::loadLanguages(void)
{ {
Edn::String homedir; Edn::String homedir;
#ifdef NDEBUG #ifdef NDEBUG
homedir = getenv("HOME"); homedir = "/usr/share/edn/";
homedir += "/.edn/";
#else #else
homedir = "./"; homedir = "./data/";
#endif #endif
Edn::String xmlFilename = homedir; Edn::String xmlFilename = homedir;
xmlFilename += "data/lang_c.xml"; xmlFilename += "lang_c.xml";
Highlight *myHightline = new Highlight(xmlFilename); Highlight *myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);
xmlFilename = homedir; xmlFilename = homedir;
xmlFilename += "data/lang_boo.xml"; xmlFilename += "lang_boo.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);
xmlFilename = homedir; xmlFilename = homedir;
xmlFilename += "data/lang_Makefile.xml"; xmlFilename += "lang_Makefile.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);
xmlFilename = homedir; xmlFilename = homedir;
xmlFilename += "data/lang_asm.xml"; xmlFilename += "lang_asm.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);
xmlFilename = homedir; xmlFilename = homedir;
xmlFilename += "data/lang_xml.xml"; xmlFilename += "lang_xml.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);
xmlFilename = homedir; xmlFilename = homedir;
xmlFilename += "data/lang_php.xml"; xmlFilename += "lang_php.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.push_back(myHightline); listHighlight.push_back(myHightline);

8
Sources/init.cpp
View File

@ -80,13 +80,13 @@ int main (int argc, char *argv[])
ColorizeManager *myColorManager = NULL; ColorizeManager *myColorManager = NULL;
myColorManager = ColorizeManager::getInstance(); myColorManager = ColorizeManager::getInstance();
Edn::String homedir; Edn::String homedir;
//homedir = getenv("HOME");
#ifdef NDEBUG #ifdef NDEBUG
homedir = getenv("HOME"); homedir = "/usr/share/edn/";
homedir += "/.edn/";
#else #else
homedir = "./"; homedir = "./data/";
#endif #endif
homedir += "data/color_black.xml"; homedir += "color_black.xml";
myColorManager->LoadFile( homedir.c_str() ); myColorManager->LoadFile( homedir.c_str() );
myColorManager->DisplayListOfColor(); myColorManager->DisplayListOfColor();

16
data/lang_Makefile.xml
View File

@ -9,9 +9,23 @@
<end>\n</end> <end>\n</end>
<EscapeChar>\</EscapeChar> <EscapeChar>\</EscapeChar>
</rule> </rule>
<rule name="doubleQuteText">
<color>doubleQuoteText</color>
<start>"</start>
<end>"</end>
<EscapeChar>\</EscapeChar>
</rule>
<rule name="simpleQuteText">
<color>doubleQuoteText</color>
<start>'</start>
<end>'</end>
</rule>
</pass1> </pass1>
<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear --> <pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
<rule name="my keyword">
<color>keyword</color>
<start>\$\([a-zA-Z_][a-zA-Z0-9_]*\)</start>
</rule>
</pass2> </pass2>
</EdnLang> </EdnLang>