From bd211ad88efa523675814ad5999c680171d6afe4 Mon Sep 17 00:00:00 2001 From: EndrII <EndrIIMail@gmail.com> Date: Sun, 26 Mar 2023 19:03:46 +0200 Subject: [PATCH] lename lib --- CMakeLists.txt | 22 +++++++------- src/Library/easyssl.qrc | 9 ------ src/Library/src/easysslModule/easyssl.qml | 12 -------- src/Library/src/easysslModule/qmldir | 3 -- src/{Example => example}/CMakeLists.txt | 16 +++++------ src/example/Deploy/easyssl.json | 27 ++++++++++++++++++ .../Deploy/easyssl.json.in | 2 +- .../android/AndroidManifest.xml.in | 0 .../android/build.gradle.in | 0 .../android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 src/{Example => example}/android/gradlew | 0 src/{Example => example}/android/gradlew.bat | 0 .../android/res/drawable/splashscreen.xml | 0 .../res/drawable/splashscreen_land.xml | 0 .../res/drawable/splashscreen_port.xml | 0 .../res/values-land/splashscreentheme.xml | 0 .../res/values-port/splashscreentheme.xml | 0 .../android/res/values/libs.xml | 0 .../android/res/values/splashscreentheme.xml | 0 .../quasarapp/androidtools/MainActivity.java | 0 src/{Example => example}/languages/de.ts | 0 src/{Example => example}/languages/en.ts | 0 src/{Example => example}/languages/es.ts | 0 src/{Example => example}/languages/fr.ts | 0 src/{Example => example}/languages/ja.ts | 0 src/{Example => example}/languages/pl.ts | 0 src/{Example => example}/languages/ru.ts | 0 src/{Example => example}/languages/tr.ts | 0 src/{Example => example}/languages/uk.ts | 0 src/{Example => example}/languages/zh.ts | 0 src/{Example => example}/main.cpp | 0 src/{Library => lib}/CMakeLists.txt | 4 +-- src/{Library => lib}/languages/en.ts | 0 src/{Library => lib}/src/public/easyssl.cpp | 2 +- src/{Library => lib}/src/public/easyssl.h | 4 +-- src/lib/src/public/easyssl/global.h | 22 ++++++++++++++ .../src/public/easyssl/global.h.in | 14 ++++----- tests/CMakeLists.txt | 4 +-- 40 files changed, 83 insertions(+), 58 deletions(-) delete mode 100644 src/Library/easyssl.qrc delete mode 100644 src/Library/src/easysslModule/easyssl.qml delete mode 100644 src/Library/src/easysslModule/qmldir rename src/{Example => example}/CMakeLists.txt (91%) create mode 100644 src/example/Deploy/easyssl.json rename src/{Example => example}/Deploy/easyssl.json.in (92%) rename src/{Example => example}/android/AndroidManifest.xml.in (100%) rename src/{Example => example}/android/build.gradle.in (100%) rename src/{Example => example}/android/gradle.properties (100%) rename src/{Example => example}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename src/{Example => example}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename src/{Example => example}/android/gradlew (100%) rename src/{Example => example}/android/gradlew.bat (100%) rename src/{Example => example}/android/res/drawable/splashscreen.xml (100%) rename src/{Example => example}/android/res/drawable/splashscreen_land.xml (100%) rename src/{Example => example}/android/res/drawable/splashscreen_port.xml (100%) rename src/{Example => example}/android/res/values-land/splashscreentheme.xml (100%) rename src/{Example => example}/android/res/values-port/splashscreentheme.xml (100%) rename src/{Example => example}/android/res/values/libs.xml (100%) rename src/{Example => example}/android/res/values/splashscreentheme.xml (100%) rename src/{Example => example}/android/src/com/quasarapp/androidtools/MainActivity.java (100%) rename src/{Example => example}/languages/de.ts (100%) rename src/{Example => example}/languages/en.ts (100%) rename src/{Example => example}/languages/es.ts (100%) rename src/{Example => example}/languages/fr.ts (100%) rename src/{Example => example}/languages/ja.ts (100%) rename src/{Example => example}/languages/pl.ts (100%) rename src/{Example => example}/languages/ru.ts (100%) rename src/{Example => example}/languages/tr.ts (100%) rename src/{Example => example}/languages/uk.ts (100%) rename src/{Example => example}/languages/zh.ts (100%) rename src/{Example => example}/main.cpp (100%) rename src/{Library => lib}/CMakeLists.txt (94%) rename src/{Library => lib}/languages/en.ts (100%) rename src/{Library => lib}/src/public/easyssl.cpp (93%) rename src/{Library => lib}/src/public/easyssl.h (91%) create mode 100644 src/lib/src/public/easyssl/global.h rename src/{Library => lib}/src/public/easyssl/global.h.in (56%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 324c318..3c1f58f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.19) project(easyssl LANGUAGES CXX) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") @@ -32,31 +32,31 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET) include(submodules/CMake/QuasarApp.cmake) updateGitVars() -set(easyssl_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") -set(easyssl_PACKAGE_ID "quasarapp.core.easyssl") +set(EASYSSL_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") +set(EASYSSL_PACKAGE_ID "quasarapp.core.easyssl") -option(easyssl_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ON) -option(easyssl_EXAMPLE "This option disables or enables example app of the ${PROJECT_NAME} project" ON) +option(EASYSSL_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ON) +option(EASYSSL_EXAMPLE "This option disables or enables example app of the ${PROJECT_NAME} project" ON) if (ANDROID OR IOS OR NOT QT_VERSION_MAJOR OR QA_WASM32) - set(easyssl_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE) + set(EASYSSL_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE) endif() if (NOT QT_VERSION_MAJOR) - set(easyssl_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE) + set(EASYSSL_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE) endif() make_directory(Distro) initAll() -add_subdirectory(src/Library) +add_subdirectory(src/lib) -if (DEFINED easyssl_EXAMPLE) - add_subdirectory(src/Example) +if (DEFINED EASYSSL_EXAMPLE) + add_subdirectory(src/example) endif() -if (easyssl_TESTS) +if (EASYSSL_TESTS) add_subdirectory(tests) else() message("The ${PROJECT_NAME} tests is disabled.") diff --git a/src/Library/easyssl.qrc b/src/Library/easyssl.qrc deleted file mode 100644 index 9b62021..0000000 --- a/src/Library/easyssl.qrc +++ /dev/null @@ -1,9 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>src/easysslModule/qmldir</file> - <file>src/easysslModule/easyssl.qml</file> - </qresource> - <qresource prefix="/easysslTr"> - <file>languages/en.qm</file> - </qresource> -</RCC> diff --git a/src/Library/src/easysslModule/easyssl.qml b/src/Library/src/easysslModule/easyssl.qml deleted file mode 100644 index a66bed1..0000000 --- a/src/Library/src/easysslModule/easyssl.qml +++ /dev/null @@ -1,12 +0,0 @@ -//# -//# Copyright (C) 2021-2023 QuasarApp. -//# Distributed under the lgplv3 software license, see the accompanying -//# Everyone is permitted to copy and distribute verbatim copies -//# of this license document, but changing it is not allowed. -//# - -import QtQuick 2.15 - -Item { - -} diff --git a/src/Library/src/easysslModule/qmldir b/src/Library/src/easysslModule/qmldir deleted file mode 100644 index 98d0648..0000000 --- a/src/Library/src/easysslModule/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module easysslModule -easyssl 1.0 easyssl.qml - diff --git a/src/Example/CMakeLists.txt b/src/example/CMakeLists.txt similarity index 91% rename from src/Example/CMakeLists.txt rename to src/example/CMakeLists.txt index ec26298..49f51d6 100644 --- a/src/Example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -5,7 +5,7 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.19) get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME) @@ -43,7 +43,7 @@ else() endif() -target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}Library) +target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}lib) target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR}) @@ -58,7 +58,7 @@ if (ANDROID) set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION}) set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}") - set(easyssl_EXTRA_LIBS + set(EASYSSL_EXTRA_LIBS ${PROJECT_NAME}Library # libName ) @@ -74,7 +74,7 @@ if (ANDROID) "${SIGPATH}/quasarapp.keystore" "${SIGPASS_QUASARAPP}" "${TARGET_DIR}" - "${easyssl_EXTRA_LIBS}") + "${EASYSSL_EXTRA_LIBS}") else() message("NO_SIGN_APP") @@ -82,7 +82,7 @@ if (ANDROID) addDeployAPK(${CURRENT_PROJECT} "${CMAKE_CURRENT_LIST_DIR}/android" "${TARGET_DIR}" - "${easyssl_EXTRA_LIBS}") + "${EASYSSL_EXTRA_LIBS}") endif() set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml") @@ -108,9 +108,9 @@ elseif(IOS) # set_xcode_property(${CURRENT_PROJECT} PRODUCT_BUNDLE_IDENTIFIER ${CHEATCARD_PACKAGE_ID} All) set_target_properties(${CURRENT_PROJECT} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER ${easyssl_PACKAGE_ID} - MACOSX_BUNDLE_BUNDLE_VERSION ${easyssl_VERSION} - MACOSX_BUNDLE_SHORT_VERSION_STRING ${easyssl_VERSION} + MACOSX_BUNDLE_GUI_IDENTIFIER ${EASYSSL_PACKAGE_ID} + MACOSX_BUNDLE_BUNDLE_VERSION ${EASYSSL_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${EASYSSL_VERSION} ) else() # Desctop deploying diff --git a/src/example/Deploy/easyssl.json b/src/example/Deploy/easyssl.json new file mode 100644 index 0000000..7ab0103 --- /dev/null +++ b/src/example/Deploy/easyssl.json @@ -0,0 +1,27 @@ +{ + "bin": [ + "src/build/Debug/easysslEaxample", + "src/build/Debug/easysslEaxample.exe" + ], + "clear": true, + "binPrefix": "/media/D/builds/build-easyssl-Desktop_Qt_5_15_2_GCC_64bit-Debug", + "libDir": [ + "/media/D/builds/easyssl", + "/home/andrei/Qt/5.15.2/gcc_64", + "/media/D/builds/build-easyssl-Desktop_Qt_5_15_2_GCC_64bit-Debug" + ], + "recursiveDepth": "10", + "deploySystem": false, + "qmlDir": "../", + "deb": true, + "qif": true, + "zip": true, + "ignoreEnv": [ + "/media/D/builds/easyssl/Distro" + ], + "extraLib": "crypto", + "targetDir": "/media/D/builds/easyssl/Distro", + "deployVersion": "0.2.a2c421a", + +} + diff --git a/src/Example/Deploy/easyssl.json.in b/src/example/Deploy/easyssl.json.in similarity index 92% rename from src/Example/Deploy/easyssl.json.in rename to src/example/Deploy/easyssl.json.in index fec5cac..034553d 100644 --- a/src/Example/Deploy/easyssl.json.in +++ b/src/example/Deploy/easyssl.json.in @@ -21,7 +21,7 @@ ], "extraLib": "crypto", "targetDir": "@CMAKE_SOURCE_DIR@/Distro", - "deployVersion": "@easyssl_VERSION@", + "deployVersion": "@EASYSSL_VERSION@", } diff --git a/src/Example/android/AndroidManifest.xml.in b/src/example/android/AndroidManifest.xml.in similarity index 100% rename from src/Example/android/AndroidManifest.xml.in rename to src/example/android/AndroidManifest.xml.in diff --git a/src/Example/android/build.gradle.in b/src/example/android/build.gradle.in similarity index 100% rename from src/Example/android/build.gradle.in rename to src/example/android/build.gradle.in diff --git a/src/Example/android/gradle.properties b/src/example/android/gradle.properties similarity index 100% rename from src/Example/android/gradle.properties rename to src/example/android/gradle.properties diff --git a/src/Example/android/gradle/wrapper/gradle-wrapper.jar b/src/example/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from src/Example/android/gradle/wrapper/gradle-wrapper.jar rename to src/example/android/gradle/wrapper/gradle-wrapper.jar diff --git a/src/Example/android/gradle/wrapper/gradle-wrapper.properties b/src/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from src/Example/android/gradle/wrapper/gradle-wrapper.properties rename to src/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/src/Example/android/gradlew b/src/example/android/gradlew similarity index 100% rename from src/Example/android/gradlew rename to src/example/android/gradlew diff --git a/src/Example/android/gradlew.bat b/src/example/android/gradlew.bat similarity index 100% rename from src/Example/android/gradlew.bat rename to src/example/android/gradlew.bat diff --git a/src/Example/android/res/drawable/splashscreen.xml b/src/example/android/res/drawable/splashscreen.xml similarity index 100% rename from src/Example/android/res/drawable/splashscreen.xml rename to src/example/android/res/drawable/splashscreen.xml diff --git a/src/Example/android/res/drawable/splashscreen_land.xml b/src/example/android/res/drawable/splashscreen_land.xml similarity index 100% rename from src/Example/android/res/drawable/splashscreen_land.xml rename to src/example/android/res/drawable/splashscreen_land.xml diff --git a/src/Example/android/res/drawable/splashscreen_port.xml b/src/example/android/res/drawable/splashscreen_port.xml similarity index 100% rename from src/Example/android/res/drawable/splashscreen_port.xml rename to src/example/android/res/drawable/splashscreen_port.xml diff --git a/src/Example/android/res/values-land/splashscreentheme.xml b/src/example/android/res/values-land/splashscreentheme.xml similarity index 100% rename from src/Example/android/res/values-land/splashscreentheme.xml rename to src/example/android/res/values-land/splashscreentheme.xml diff --git a/src/Example/android/res/values-port/splashscreentheme.xml b/src/example/android/res/values-port/splashscreentheme.xml similarity index 100% rename from src/Example/android/res/values-port/splashscreentheme.xml rename to src/example/android/res/values-port/splashscreentheme.xml diff --git a/src/Example/android/res/values/libs.xml b/src/example/android/res/values/libs.xml similarity index 100% rename from src/Example/android/res/values/libs.xml rename to src/example/android/res/values/libs.xml diff --git a/src/Example/android/res/values/splashscreentheme.xml b/src/example/android/res/values/splashscreentheme.xml similarity index 100% rename from src/Example/android/res/values/splashscreentheme.xml rename to src/example/android/res/values/splashscreentheme.xml diff --git a/src/Example/android/src/com/quasarapp/androidtools/MainActivity.java b/src/example/android/src/com/quasarapp/androidtools/MainActivity.java similarity index 100% rename from src/Example/android/src/com/quasarapp/androidtools/MainActivity.java rename to src/example/android/src/com/quasarapp/androidtools/MainActivity.java diff --git a/src/Example/languages/de.ts b/src/example/languages/de.ts similarity index 100% rename from src/Example/languages/de.ts rename to src/example/languages/de.ts diff --git a/src/Example/languages/en.ts b/src/example/languages/en.ts similarity index 100% rename from src/Example/languages/en.ts rename to src/example/languages/en.ts diff --git a/src/Example/languages/es.ts b/src/example/languages/es.ts similarity index 100% rename from src/Example/languages/es.ts rename to src/example/languages/es.ts diff --git a/src/Example/languages/fr.ts b/src/example/languages/fr.ts similarity index 100% rename from src/Example/languages/fr.ts rename to src/example/languages/fr.ts diff --git a/src/Example/languages/ja.ts b/src/example/languages/ja.ts similarity index 100% rename from src/Example/languages/ja.ts rename to src/example/languages/ja.ts diff --git a/src/Example/languages/pl.ts b/src/example/languages/pl.ts similarity index 100% rename from src/Example/languages/pl.ts rename to src/example/languages/pl.ts diff --git a/src/Example/languages/ru.ts b/src/example/languages/ru.ts similarity index 100% rename from src/Example/languages/ru.ts rename to src/example/languages/ru.ts diff --git a/src/Example/languages/tr.ts b/src/example/languages/tr.ts similarity index 100% rename from src/Example/languages/tr.ts rename to src/example/languages/tr.ts diff --git a/src/Example/languages/uk.ts b/src/example/languages/uk.ts similarity index 100% rename from src/Example/languages/uk.ts rename to src/example/languages/uk.ts diff --git a/src/Example/languages/zh.ts b/src/example/languages/zh.ts similarity index 100% rename from src/Example/languages/zh.ts rename to src/example/languages/zh.ts diff --git a/src/Example/main.cpp b/src/example/main.cpp similarity index 100% rename from src/Example/main.cpp rename to src/example/main.cpp diff --git a/src/Library/CMakeLists.txt b/src/lib/CMakeLists.txt similarity index 94% rename from src/Library/CMakeLists.txt rename to src/lib/CMakeLists.txt index f0f9b14..dc8cdff 100644 --- a/src/Library/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -5,12 +5,12 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.19) get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME) set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}") -add_definitions(-Deasyssl_LIBRARY) +add_definitions(-DEASYSSL_LIBRARY) file(GLOB_RECURSE SOURCE_CPP diff --git a/src/Library/languages/en.ts b/src/lib/languages/en.ts similarity index 100% rename from src/Library/languages/en.ts rename to src/lib/languages/en.ts diff --git a/src/Library/src/public/easyssl.cpp b/src/lib/src/public/easyssl.cpp similarity index 93% rename from src/Library/src/public/easyssl.cpp rename to src/lib/src/public/easyssl.cpp index cb17939..2bdca8e 100644 --- a/src/Library/src/public/easyssl.cpp +++ b/src/lib/src/public/easyssl.cpp @@ -16,7 +16,7 @@ bool init() { } QString version() { - return easyssl_VERSION; + return EASYSSL_VERSION; } diff --git a/src/Library/src/public/easyssl.h b/src/lib/src/public/easyssl.h similarity index 91% rename from src/Library/src/public/easyssl.h rename to src/lib/src/public/easyssl.h index 1d8b955..ed4d5e6 100644 --- a/src/Library/src/public/easyssl.h +++ b/src/lib/src/public/easyssl.h @@ -16,12 +16,12 @@ namespace easyssl { * @brief init main initialize method of The easyssl library * @return true if library initialized successfull */ -bool easyssl_EXPORT init(); +bool EASYSSL_EXPORT init(); /** * @brief version This method return string value of a library version * @return string value of a library version */ -QString easyssl_EXPORT version(); +QString EASYSSL_EXPORT version(); }; diff --git a/src/lib/src/public/easyssl/global.h b/src/lib/src/public/easyssl/global.h new file mode 100644 index 0000000..245f000 --- /dev/null +++ b/src/lib/src/public/easyssl/global.h @@ -0,0 +1,22 @@ +//# +//# Copyright (C) 2018-2023 QuasarApp. +//# Distributed under the GPLv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef EASYSSL_GLOBAL_H +#define EASYSSL_GLOBAL_H + +#include <QtCore/qglobal.h> + +#define EASYSSL_VERSION "0.2.a2c421a" + +#if defined(EASYSSL_LIBRARY) +# define EASYSSL_EXPORT Q_DECL_EXPORT +#else +# define EASYSSL_EXPORT Q_DECL_IMPORT +#endif + +#endif //EASYSSL_GLOBAL_H + diff --git a/src/Library/src/public/easyssl/global.h.in b/src/lib/src/public/easyssl/global.h.in similarity index 56% rename from src/Library/src/public/easyssl/global.h.in rename to src/lib/src/public/easyssl/global.h.in index 5fbbaed..c39c237 100644 --- a/src/Library/src/public/easyssl/global.h.in +++ b/src/lib/src/public/easyssl/global.h.in @@ -5,18 +5,18 @@ //# of this license document, but changing it is not allowed. //# -#ifndef easyssl_GLOBAL_H -#define easyssl_GLOBAL_H +#ifndef EASYSSL_GLOBAL_H +#define EASYSSL_GLOBAL_H #include <QtCore/qglobal.h> -#define easyssl_VERSION "@easyssl_VERSION@" +#define EASYSSL_VERSION "@EASYSSL_VERSION@" -#if defined(easyssl_LIBRARY) -# define easyssl_EXPORT Q_DECL_EXPORT +#if defined(EASYSSL_LIBRARY) +# define EASYSSL_EXPORT Q_DECL_EXPORT #else -# define easyssl_EXPORT Q_DECL_IMPORT +# define EASYSSL_EXPORT Q_DECL_IMPORT #endif -#endif //easyssl_GLOBAL_H +#endif //EASYSSL_GLOBAL_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 385933f..8afd4c4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.19) get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME) @@ -20,7 +20,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units") add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) -target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}Library) +target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}lib) target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})