diff --git a/Makefile b/Makefile index 2f3f263..6aacc6d 100644 --- a/Makefile +++ b/Makefile @@ -290,11 +290,11 @@ install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE) @echo $(F_ROUGE)" (stripped) $(OUTPUT_NAME_RELEASE) => $(PROG_NAME) "$(F_NORMALE) @cp $(OUTPUT_NAME_RELEASE) $(PROG_NAME) @strip -s $(PROG_NAME) - @echo $(F_VERT)" (copy) $(PROG_NAME) ~/.bin/ "$(F_NORMALE) - @cp -vf $(PROG_NAME) ~/.bin/ - @echo $(F_VERT)" (data) data/* ==> ~/.edn/data/ "$(F_NORMALE) - @mkdir -p ~/.edn/data - @cp -vf data/*.xml ~/.edn/data + @echo $(F_VERT)" (copy) $(PROG_NAME) /usr/bin/ "$(F_NORMALE) + @cp -vf $(PROG_NAME) /usr/bin/ + @echo $(F_VERT)" (data) data/* ==> /usr/share/edn/ "$(F_NORMALE) + @mkdir -p /usr/share/edn/ + @cp -vf data/*.xml /usr/share/edn/ diff --git a/Sources/Highlight/HighlightManager.cpp b/Sources/Highlight/HighlightManager.cpp index af1d979..711ad75 100644 --- a/Sources/Highlight/HighlightManager.cpp +++ b/Sources/Highlight/HighlightManager.cpp @@ -68,39 +68,38 @@ void HighlightManager::loadLanguages(void) { Edn::String homedir; #ifdef NDEBUG - homedir = getenv("HOME"); - homedir += "/.edn/"; + homedir = "/usr/share/edn/"; #else - homedir = "./"; + homedir = "./data/"; #endif Edn::String xmlFilename = homedir; - xmlFilename += "data/lang_c.xml"; + xmlFilename += "lang_c.xml"; Highlight *myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); xmlFilename = homedir; - xmlFilename += "data/lang_boo.xml"; + xmlFilename += "lang_boo.xml"; myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); xmlFilename = homedir; - xmlFilename += "data/lang_Makefile.xml"; + xmlFilename += "lang_Makefile.xml"; myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); xmlFilename = homedir; - xmlFilename += "data/lang_asm.xml"; + xmlFilename += "lang_asm.xml"; myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); xmlFilename = homedir; - xmlFilename += "data/lang_xml.xml"; + xmlFilename += "lang_xml.xml"; myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); xmlFilename = homedir; - xmlFilename += "data/lang_php.xml"; + xmlFilename += "lang_php.xml"; myHightline = new Highlight(xmlFilename); listHighlight.push_back(myHightline); diff --git a/Sources/init.cpp b/Sources/init.cpp index f353e61..7286816 100644 --- a/Sources/init.cpp +++ b/Sources/init.cpp @@ -80,13 +80,13 @@ int main (int argc, char *argv[]) ColorizeManager *myColorManager = NULL; myColorManager = ColorizeManager::getInstance(); Edn::String homedir; + //homedir = getenv("HOME"); #ifdef NDEBUG - homedir = getenv("HOME"); - homedir += "/.edn/"; + homedir = "/usr/share/edn/"; #else - homedir = "./"; + homedir = "./data/"; #endif - homedir += "data/color_black.xml"; + homedir += "color_black.xml"; myColorManager->LoadFile( homedir.c_str() ); myColorManager->DisplayListOfColor(); diff --git a/data/lang_Makefile.xml b/data/lang_Makefile.xml index 1a9aed6..1b7e296 100644 --- a/data/lang_Makefile.xml +++ b/data/lang_Makefile.xml @@ -9,9 +9,23 @@ \n \ + + doubleQuoteText + " + " + \ + + + doubleQuoteText + ' + ' + - + + keyword + \$\([a-zA-Z_][a-zA-Z0-9_]*\) +