From c5b6519dc60742e236eeab5da71fc98f85967845 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 18 Apr 2013 18:02:27 +0200 Subject: [PATCH] [DEV] build the soft with the new builder --- sources/Makefile_edn.py | 31 +++++++++++++++++++++++++++++-- sources/appl/Gui/MainWindows.cpp | 4 ++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/sources/Makefile_edn.py b/sources/Makefile_edn.py index f115424..e77ddef 100755 --- a/sources/Makefile_edn.py +++ b/sources/Makefile_edn.py @@ -1,5 +1,6 @@ #!/usr/bin/python import module +import buildTools # prevent erro integration #if 'myModule' in globals(): @@ -52,10 +53,36 @@ myModule.AddSrcFile([ myModule.AddModuleDepend('ewol') myModule.CompileFlags_CC([ - '-DPROJECT_NAME="'+myModule.name+'"', - '-DAPPL_VERSION_TAG_NAME="4.25.26.23.25.88"']) + '-DPROJECT_NAME="\\"'+myModule.name+'\\""', + '-DAPPL_VERSION_TAG_NAME="\\"4.25.26.23.25.88\\""']) myModule.CopyFile('../data/icon.png','icon.png') +myModule.CopyFolder('../data/icon.*','') +myModule.CopyFolder('../data/color/*.xml','color/') +myModule.CopyFolder('../data/languages/asm/*.xml','languages/asm/') +myModule.CopyFolder('../data/languages/bash/*.xml','languages/bash/') +myModule.CopyFolder('../data/languages/boo/*.xml','languages/boo/') +myModule.CopyFolder('../data/languages/c/*.xml','languages/c/') +myModule.CopyFolder('../data/languages/glsl/*.xml','languages/glsl/') +myModule.CopyFolder('../data/languages/in/*.xml','languages/in/') +myModule.CopyFolder('../data/languages/java/*.xml','languages/java/') +myModule.CopyFolder('../data/languages/lua/*.xml','languages/lua/') +myModule.CopyFolder('../data/languages/makefile/*.xml','languages/makefile/') +myModule.CopyFolder('../data/languages/matlab/*.xml','languages/matlab/') +myModule.CopyFolder('../data/languages/php/*.xml','languages/php/') +myModule.CopyFolder('../data/languages/xml/*.xml','languages/xml/') +myModule.CopyFolder('../data/languages/python/*.xml','languages/python/') +myModule.CopyFolder('../data/theme/default/*.svg','theme/default/') + +myModule.AddPath(buildTools.GetCurrentPath(__file__)) +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/Buffer") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/Buffer/EdnBuf") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/Colorize") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/ctags") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/Gui") +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/appl/Highlight") + # add the currrent module at the module.AddModule(myModule) diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index 5221238..e70040c 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -56,10 +56,10 @@ class ParameterAboutGui : public widget::Sizer } etk::UString tmpLabel = ""; tmpLabel += " Editeur De N'ours : v"; - tmpLabel += APPL_VERSION_TAG_NAME; + //tmpLabel += APPL_VERSION_TAG_NAME; tmpLabel += "
"; tmpLabel += " Build Time : "; - tmpLabel += BUILD_TIME; + //tmpLabel += BUILD_TIME; tmpLabel += "
"; tmpLabel += " Website : https://github.com/HeeroYui/edn
"; tmpLabel += " License : GPL v3
";