From a904f30b34639839a86329d022e91842f9b2d286 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Wed, 2 May 2012 18:22:32 +0200 Subject: [PATCH] add a simple install script and corection of the release folder selection --- install.sh | 8 ++++++++ jni/Linux.mk | 4 +++- jni/appl/init.cpp | 28 ++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100755 install.sh diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..2fa39eb --- /dev/null +++ b/install.sh @@ -0,0 +1,8 @@ +#!/usr/bin/bash + +#really simple to install +sudo cp linux/bin/release/edn /usr/bin/edn +sudo chmod 777 /usr/bin/edn +sudo mkdir -p /usr/share/edn +sudo rm -r /usr/share/edn/* +sudo cp assets/* /usr/share/edn/ diff --git a/jni/Linux.mk b/jni/Linux.mk index ca2e629..97af4dc 100644 --- a/jni/Linux.mk +++ b/jni/Linux.mk @@ -30,7 +30,9 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \ else LOCAL_CFLAGS := -D__PLATFORM__Linux \ -DETK_DEBUG_LEVEL=3 \ - -DAPPL_DEBUG_LEVEL=1 + -DAPPL_DEBUG_LEVEL=1 \ + -DMODE_RELEASE \ + -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" endif include $(BUILD_EXECUTABLE) diff --git a/jni/appl/init.cpp b/jni/appl/init.cpp index 9d026e3..4150654 100644 --- a/jni/appl/init.cpp +++ b/jni/appl/init.cpp @@ -49,13 +49,25 @@ MainWindows * basicWindows = NULL; */ void APP_Init(void) { - APPL_INFO("==> Init Edn (START)"); + #ifdef __PLATFORM__Linux + #ifdef MODE_RELEASE + APPL_CRITICAL("==> Init "PROJECT_NAME" (START) (Linux) (Release)"); + #else + APPL_CRITICAL("==> Init "PROJECT_NAME" (START) (Linux) (Debug)"); + #endif + #else + #ifdef MODE_RELEASE + APPL_CRITICAL("==> Init "PROJECT_NAME" (START) (Android) (Release)"); + #else + APPL_CRITICAL("==> Init "PROJECT_NAME" (START) (Android) (Debug)"); + #endif + #endif ewol::ChangeSize(800, 600); // set the default Path of the application : - #ifdef PLATFORM_Linux + #ifdef __PLATFORM__Linux etk::UString homedir; - #ifdef NDEBUG + #ifdef MODE_RELEASE homedir = "/usr/share/"PROJECT_NAME"/"; #else char cCurrentPath[FILENAME_MAX]; @@ -68,9 +80,9 @@ void APP_Init(void) } #endif // TODO : Remove the Utf8Data - SetBaseFolderData(homedir.Utf8Data()); - SetBaseFolderDataUser("~/."PROJECT_NAME"/"); - SetBaseFolderCache("/tmp/"PROJECT_NAME"/"); + etk::SetBaseFolderData(homedir.Utf8Data()); + etk::SetBaseFolderDataUser("~/."PROJECT_NAME"/"); + etk::SetBaseFolderCache("/tmp/"PROJECT_NAME"/"); #endif ewol::SetFontFolder("Font"); @@ -90,8 +102,8 @@ void APP_Init(void) // set color and other trucs... ColorizeManager::Init(); - etk::UString homedir = "color_white.xml"; - ColorizeManager::LoadFile( homedir.Utf8Data() ); + etk::UString corlorFile = "color_white.xml"; + ColorizeManager::LoadFile( corlorFile.Utf8Data() ); ColorizeManager::DisplayListOfColor(); HighlightManager::Init();