Merge "Huge directory Restructuring" pull request #680

.gitignore

@@ -4,15 +4,13 @@
 
 conf/*
 !conf/*.dist
+env/dist/*
+env/user/*
 modules/*
-
-!modules/drassil
-modules/drassil/joiner
-!modules/hw-core
-!modules/acore
-!modules/worldengine
-
 build*/
+var/*
+
+!.gitkeep
 
 #
 #Generic

CMakeLists.txt

@@ -28,13 +28,13 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 set(AC_PATH_ROOT "${CMAKE_SOURCE_DIR}")
 
 # set macro-directory
-set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/worldengine/nucleus/src/cmake/macros")
+set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/src/cmake/macros")
 
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 
 # some utils for cmake
-include(modules/drassil/cmake-utils/utils.cmake)
+include(deps/drassil/cmake-utils/utils.cmake)
 
 include(src/cmake/ac_macros.cmake)
 
@@ -97,16 +97,14 @@ include(src/cmake/showoptions.cmake)
 # Loading framework
 #
 
-add_subdirectory(modules/worldengine/deps)
+add_subdirectory(deps)
 
 if( SERVERS OR TOOLS)
-  add_subdirectory(modules/worldengine/nucleus)
-  add_subdirectory(modules/worldengine/lib-collision)
-  add_subdirectory(modules/acore/game-framework)
+  add_subdirectory(src/common)
 endif()
 
 if( TOOLS )
-  add_subdirectory(modules/acore/extractors)
+  add_subdirectory(src/tools)
 endif()
 
 #

apps/bash_shared/defines.sh

@@ -1,11 +1,13 @@
 unamestr=`uname`
 if [[ "$unamestr" == 'Darwin' ]]; then
-   AC_PATH_ROOT=$(greadlink -f "$AC_PATH_BIN/../")
+   AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../")
 else
-   AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
+   AC_PATH_ROOT=$(readlink -f "$AC_PATH_APPS/../")
 fi
 
 AC_PATH_CONF="$AC_PATH_ROOT/conf"
 
 AC_PATH_MODULES="$AC_PATH_ROOT/modules"
 
+AC_PATH_DEPS="$AC_PATH_ROOT/deps"
+

apps/bash_shared/includes.sh

@@ -3,13 +3,13 @@
 # force default language for applications
 LC_ALL=C 
 
-AC_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
+AC_PATH_APPS="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
 
-AC_PATH_SHARED="$AC_PATH_BIN/bash_shared"
+AC_PATH_SHARED="$AC_PATH_APPS/bash_shared"
 
 source "$AC_PATH_SHARED/defines.sh"
 
-source "$AC_PATH_MODULES/hw-core/bash-lib-event/src/hooks.sh"
+source "$AC_PATH_DEPS/hw-core/bash-lib-event/src/hooks.sh"
 
 
 function registerHooks() { hwc_event_register_hooks "$@"; }

apps/compiler/includes/includes.sh

@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_COMPILER="$AC_PATH_BIN/compiler"
+AC_PATH_COMPILER="$AC_PATH_APPS/compiler"
 
 if [ -f "$AC_PATH_COMPILER/config.sh"  ]; then
     source "$AC_PATH_COMPILER/config.sh" # should overwrite previous
@@ -10,7 +10,7 @@ fi
 
 function ac_on_after_build() {
     # move the run engine
-    cp -rvf "$AC_PATH_MODULES/acore/startup-scripts/"* "$BINPATH"
+    cp -rvf "$AC_PATH_APPS/startup-scripts/"* "$BINPATH"
 }
 
 registerHooks "ON_AFTER_BUILD" ac_on_after_build

apps/db_assembler/includes/includes.sh

@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_DBASSEMBLER="$AC_PATH_BIN/db_assembler"
+AC_PATH_DBASSEMBLER="$AC_PATH_APPS/db_assembler"
 
 if [ -f "$AC_PATH_DBASSEMBLER/config.sh"  ]; then
     source "$AC_PATH_DBASSEMBLER/config.sh" # should overwrite previous

apps/db_exporter/db_export.sh

@@ -2,7 +2,7 @@
 
 ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
 
-source $ROOTPATH"/bin/bash_shared/includes.sh"
+source $ROOTPATH"/apps/bash_shared/includes.sh"
 
 if [ -f "./config.sh"  ]; then
     source "./config.sh" # should overwrite previous

apps/installer/includes/includes.sh

@@ -2,13 +2,13 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_INSTALLER="$AC_PATH_BIN/installer"
+AC_PATH_INSTALLER="$AC_PATH_APPS/installer"
 
 if [ -f "$AC_PATH_INSTALLER/config.sh"  ]; then
     source "$AC_PATH_INSTALLER/config.sh" # should overwrite previous
 fi
 
-source "$AC_PATH_BIN/compiler/includes/includes.sh"
-source "$AC_PATH_BIN/db_assembler/includes/includes.sh"
+source "$AC_PATH_APPS/compiler/includes/includes.sh"
+source "$AC_PATH_APPS/db_assembler/includes/includes.sh"
 
 source "$AC_PATH_INSTALLER/includes/functions.sh"

apps/installer/main.sh

@@ -53,10 +53,10 @@ function _switch() {
             inst_module_remove $2
             ;;
         "Sub Menu >> Compiler")
-            bash "$AC_PATH_BIN/compiler/compiler.sh"
+            bash "$AC_PATH_APPS/compiler/compiler.sh"
             ;;
         "Sub Menu >> DB Assembler")
-            bash "$AC_PATH_BIN/db_assembler/db_assembler.sh"
+            bash "$AC_PATH_APPS/db_assembler/db_assembler.sh"
             ;;
         "Quit")
             echo "Goodbye!"

bin/acore

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ./acore-installer

bin/acore-compiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/compiler/compiler.sh

bin/acore-db-asm

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_assembler/db_assembler.sh

bin/acore-db-export

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_exporter/db_exporter.sh

bin/acore-db-pendings

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_pendings/import.sh

bin/acore-installer

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/installer/main.sh

conf/config.sh.dist

@@ -2,13 +2,13 @@
 SRCPATH="$AC_PATH_ROOT"
 
 # absolute path where build files must be stored
-BUILDPATH="$AC_PATH_ROOT/build/obj"
+BUILDPATH="$AC_PATH_ROOT/var/build/obj"
 
 # absolute path where binary files must be stored
-BINPATH="$AC_PATH_ROOT/build/dist"
+BINPATH="$AC_PATH_ROOT/env/dist"
 
 # absolute path where config. files must be stored
-CONFDIR="$AC_PATH_ROOT/build/dist/etc/"
+CONFDIR="$AC_PATH_ROOT/env/dist/etc/"
 
 ##############################################
 #
@@ -71,7 +71,7 @@ DATABASES=(
 	"WORLD"
 )
 
-OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/"
+OUTPUT_FOLDER="$AC_PATH_ROOT/env/dist/sql/"
 
 #
 # Enable following flag 
@@ -80,7 +80,7 @@ OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/"
 #
 BACKUP_ENABLE=true
 
-BACKUP_FOLDER="$AC_PATH_ROOT/bin/db_assembler/backup/"
+BACKUP_FOLDER="$AC_PATH_ROOT/env/dist/sql/backup/"
 
 # FULL DB
 DB_CHARACTERS_PATHS=(