From 858fd3a4283181365d734def5f780094534f67c3 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sun, 4 Nov 2012 15:46:13 +0100 Subject: [PATCH] [DEV] cghange the basic Idea of the basic env variable --- Makefile | 45 +++++++++++++++++++++++++++- Sources/appl/Gui/CodeView.cpp | 3 +- Sources/appl/Gui/TagFileSelection.h | 3 +- Sources/appl/ctags/CTagsManager.cpp | 16 +++++----- changelog | 0 config/Android.config | 17 ++++++----- config/Linux.config | 2 -- config/Windows.config | 11 +++++++ edn.jks => edn-debug.jks | Bin install.sh | 4 +-- 10 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 changelog rename edn.jks => edn-debug.jks (100%) diff --git a/Makefile b/Makefile index 24abfe2..08444fc 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,52 @@ # this is minimal application main makefile #############################################################################" -#need to define the project name in hard to prevent some error in the config system : +# Project name ==> generate the application name [a-z] <== make attention at the case this generate error on Android compilation PROJECT_NAME=edn +#Can be manny things, but limit whith no space no special char and no Maj ... [a-z] +# com : Commercial +# net : Network?? +# org : Organisation +# gov : Governement +# mil : Military +# edu : Education +# pri : Private +# museum : ... +PROJECT_COMPAGNY_TYPE=org + +# Compagny name of the project [a-zA-Z0-9 \-] +PROJECT_COMPAGNY_NAME=Edouard DUPIN + +# List of mainainer that might be contact in problem case : "Mr NAME Surname" "second ..." +PROJECT_MAINTAINER="Mr DUPIN Edouard " + +# the icon of the project is all time needed ... if it is not present the ewol icon might be set (must be a .png file) (and no space in the fileName and filePath) +PROJECT_ICON=$(shell pwd)/data/icon.png + +# project section : (must be separate by coma +# refer to : http://packages.debian.org/sid/ +# admin cli-mono comm database debian-installer +# debug doc editors electronics devel embedded +# fonts games gnome gnu-r gnustep graphics +# hamradio haskell httpd interpreters java +# kde kernel libdevel libs lisp localization +# mail math misc net news ocaml oldlibs otherosfs +# perl php python ruby science shells sound tex +# text utils vcs video virtual web x11 xfce zope ... +PROJECT_SECTION=Development,Editors + +# project prority +# required : Packages which are necessary for the proper functioning of the system (usually, this means that dpkg functionality depends on these packages). Removing a required package may cause your system to become totally broken and you may not even be able to use dpkg to put things back, so only do so if you know what you are doing. Systems with only the required packages are probably unusable, but they do have enough functionality to allow the sysadmin to boot and install more software. +# important : Important programs, including those which one would expect to find on any Unix-like system. If the expectation is that an experienced Unix person who found it missing would say "What on earth is going on, where is foo?", it must be an important package.[6] Other packages without which the system will not run well or be usable must also have priority important. This does not include Emacs, the X Window System, TeX or any other large applications. The important packages are just a bare minimum of commonly-expected and necessary tools. +# standard : These packages provide a reasonably small but not too limited character-mode system. This is what will be installed by default if the user doesn't select anything else. It doesn't include many large applications. +# optional : (In a sense everything that isn't required is optional, but that's not what is meant here.) This is all the software that you might reasonably want to install if you didn't know what it was and don't have specialized requirements. This is a much larger system and includes the X Window System, a full TeX distribution, and many applications. Note that optional packages should not conflict with each other. +# extra : This contains all packages that conflict with others with required, important, standard or optional priorities, or are only likely to be useful if you already know what they are or have specialized requirements (such as packages containing only detached debugging symbols). +PROJECT_PRIORITY=optional + +# description of the current project inside quote and no \n +PROJECT_DESCRIPTION="Text editor for sources code with ctags management" + # Add package needed : # current user packages USER_PACKAGES =$(shell pwd)/Sources/ diff --git a/Sources/appl/Gui/CodeView.cpp b/Sources/appl/Gui/CodeView.cpp index 8b46417..fac8be6 100644 --- a/Sources/appl/Gui/CodeView.cpp +++ b/Sources/appl/Gui/CodeView.cpp @@ -471,4 +471,5 @@ void CodeView::SetFontSize(int32_t size) { m_OObjectTextBoldItalic.SetFont(fontName); } -#endif \ No newline at end of file +#endif + diff --git a/Sources/appl/Gui/TagFileSelection.h b/Sources/appl/Gui/TagFileSelection.h index 081c08a..a251caf 100644 --- a/Sources/appl/Gui/TagFileSelection.h +++ b/Sources/appl/Gui/TagFileSelection.h @@ -77,4 +77,5 @@ namespace appl { }; -#endif \ No newline at end of file +#endif + diff --git a/Sources/appl/ctags/CTagsManager.cpp b/Sources/appl/ctags/CTagsManager.cpp index 8435282..0018e96 100644 --- a/Sources/appl/ctags/CTagsManager.cpp +++ b/Sources/appl/ctags/CTagsManager.cpp @@ -52,7 +52,7 @@ class CTagsManager: public ewol::EObject const char * const GetObjectType(void) { return "CTagsManager"; - } + }; /** * @brief Receive a message from an other EObject with a specific eventId and data * @param[in] CallerObject Pointer on the EObject that information came from @@ -66,7 +66,7 @@ class CTagsManager: public ewol::EObject void LoadTagFile(void); int32_t MultipleJump(void); void JumpTo(void); - void PrintTag(const tagEntry *entry, bool small); + void PrintTag(const tagEntry *entry); etk::UString GetFolder(etk::UString &inputString); etk::UString m_tagFolderBase; etk::UString m_tagFilename; @@ -255,7 +255,7 @@ void CTagsManager::JumpTo(void) etk::UString tmpFile(m_tagFolderBase + "/" + entry.file); etk::FSNode myfile(tmpFile); int32_t lineID = entry.address.lineNumber; - PrintTag(&entry, true); + PrintTag(&entry); if (tagsFindNext (m_ctagFile, &entry) == TagSuccess) { APPL_INFO("Multiple file destination ..."); @@ -268,7 +268,7 @@ void CTagsManager::JumpTo(void) tmpFile = m_tagFolderBase + "/" + entry.file; myfile = tmpFile; lineID = entry.address.lineNumber; - PrintTag(&entry, true); + PrintTag(&entry); tmpWidget->AddCtagsNewItem(myfile.GetName(), lineID); } while (tagsFindNext (m_ctagFile, &entry) == TagSuccess); PopUpWidgetPush(tmpWidget); @@ -287,12 +287,12 @@ void CTagsManager::JumpTo(void) } -void CTagsManager::PrintTag (const tagEntry *entry, bool small) +void CTagsManager::PrintTag(const tagEntry *entry) { - if (small==true) { + #if 1 APPL_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file << "\" at line="<< (int32_t)entry->address.lineNumber); - } else { + #else int i; APPL_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file << "\" pattern=\"" << entry->address.pattern @@ -308,6 +308,6 @@ void CTagsManager::PrintTag (const tagEntry *entry, bool small) for (i = 0 ; i < entry->fields.count ; ++i) { APPL_INFO(" " << entry->fields.list[i].key << ":" << entry->fields.list[i].value ); } - } + #endif } diff --git a/changelog b/changelog new file mode 100644 index 0000000..e69de29 diff --git a/config/Android.config b/config/Android.config index cefcf59..6d70e82 100644 --- a/config/Android.config +++ b/config/Android.config @@ -21,17 +21,15 @@ CONFIG_BUILD_EDN=y # CONFIG_BUILD_LIBZIP is not set # -# ewol +# edn # # # General # -# CONFIG___VIDEO__OPENGL_ES_1 is not set -CONFIG___VIDEO__OPENGL_ES_2=y -CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Editor" -CONFIG___EWOL_APPL_ORGANISATION_TYPE__="org" -CONFIG___EWOL_APPL_COMPAGNY__="Edouard DUPIN" +CONFIG_APPL_BUFFER_FONT_NORMAL=y +# CONFIG_APPL_BUFFER_FONT_DISTANCE_FIELD is not set + # # Android @@ -41,7 +39,7 @@ CONFIG___EWOL_ANDROID_MINIMUM_SDK_VERSION__=9 CONFIG___EWOL_ANDROID_ORIENTATION_AUTO__=y # CONFIG___EWOL_ANDROID_ORIENTATION_LANDSCAPE__ is not set # CONFIG___EWOL_ANDROID_ORIENTATION_PORTRAIT__ is not set -CONFIG___EWOL_ANDROID_ICON__="data/icon" + # # Permissions @@ -59,3 +57,8 @@ CONFIG___ANDROID_PERMISSION__WRITE_EXTERNAL_STORAGE__=y # CONFIG___ANDROID_PERMISSION__VIBRATE__ is not set # CONFIG___ANDROID_PERMISSION__ACCESS_COARSE_LOCATION__ is not set # CONFIG___ANDROID_PERMISSION__ACCESS_FINE_LOCATION__ is not set +# CONFIG___VIDEO__OPENGL_ES_1 is not set + + +CONFIG___VIDEO__OPENGL_ES_2=y +CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor" diff --git a/config/Linux.config b/config/Linux.config index 8c6de3c..2551c18 100644 --- a/config/Linux.config +++ b/config/Linux.config @@ -40,5 +40,3 @@ CONFIG_APPL_BUFFER_FONT_NORMAL=y # CONFIG___VIDEO__OPENGL_ES_1 is not set CONFIG___VIDEO__OPENGL_ES_2=y CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor" -CONFIG___EWOL_APPL_ORGANISATION_TYPE__="org" -CONFIG___EWOL_APPL_COMPAGNY__="Unknow" diff --git a/config/Windows.config b/config/Windows.config index 172983e..2551c18 100644 --- a/config/Windows.config +++ b/config/Windows.config @@ -20,6 +20,16 @@ CONFIG_BUILD_EDN=y # CONFIG_BUILD_ZLIB is not set # CONFIG_BUILD_LIBZIP is not set +# +# edn +# + +# +# General +# +CONFIG_APPL_BUFFER_FONT_NORMAL=y +# CONFIG_APPL_BUFFER_FONT_DISTANCE_FIELD is not set + # # ewol # @@ -29,3 +39,4 @@ CONFIG_BUILD_EDN=y # # CONFIG___VIDEO__OPENGL_ES_1 is not set CONFIG___VIDEO__OPENGL_ES_2=y +CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor" diff --git a/edn.jks b/edn-debug.jks similarity index 100% rename from edn.jks rename to edn-debug.jks diff --git a/install.sh b/install.sh index 342d058..ffabefb 100755 --- a/install.sh +++ b/install.sh @@ -2,8 +2,8 @@ #really simple to install echo "- copy binary /usr/bin/edn" -sudo cp -vf out/Linux/release/staging/usr/bin/edn /usr/bin/edn +sudo cp -vf out/Linux/release/staging/edn/usr/bin/edn /usr/bin/edn sudo mkdir -p /usr/share/edn echo "- Remove the folder /usr/share/edn/*" sudo rm -rf /usr/share/edn/* -sudo cp -rfv out/Linux/release/staging/usr/share/* /usr/share/ +sudo cp -rfv out/Linux/release/staging/edn/usr/share/* /usr/share/