Refactor: Renamed libdeng2 to libcore (deng_core)

skyjake · May 2, 2014 · 305f4eb · 305f4eb
1 parent c871117
commit 305f4eb
Show file tree

Hide file tree

Showing 602 changed files with 476 additions and 516 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@ For [compilation instructions](http://dengine.net/dew/index.php?title=Compilatio
 
 ## Libraries
 
-**libdeng2** is the core of Doomsday 2. It is a C++ class framework containing functionality such as the file system, plugin loading, Doomsday Script, network communications, and generic data structures. Almost everything relies or will rely on this core library.
+**libcore** is the core of Doomsday 2. It is a C++ class framework containing functionality such as the file system, plugin loading, Doomsday Script, network communications, and generic data structures. Almost everything relies or will rely on this core library.
 
-**liblegacy** is a collection of C language routines extracted from the old Doomsday 1 code base. Its purpose is to (eventually) act as a C wrapper for libdeng2. (Game plugins are mostly in C.)
+**liblegacy** is a collection of C language routines extracted from the old Doomsday 1 code base. Its purpose is to (eventually) act as a C wrapper for libcore. (Game plugins are mostly in C.)
 
-**libgui** builds on libdeng2 to add low-level GUI capabilities such as OpenGL graphics, fonts, images, and input devices.
+**libgui** builds on libcore to add low-level GUI capabilities such as OpenGL graphics, fonts, images, and input devices.
 
-**libappfw** contains the Doomsday UI framework: widgets, generic dialogs, abstract data models. libappfw is built on libgui and libdeng2.
+**libappfw** contains the Doomsday UI framework: widgets, generic dialogs, abstract data models. libappfw is built on libgui and libcore.
 
 **libshell** has functionality related to connecting to and controlling Doomsday servers remotely.
 

diff --git a/distrib/autobuild.py b/distrib/autobuild.py
@@ -375,7 +375,7 @@ def generate_apidoc():
     system_command('wc -l doxyissues-qch.txt')
 
     print >> sys.stderr, "\nPublic API 2.0 docs..."
-    os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libdeng2'))    
+    os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libcore'))    
     system_command('doxygen api2.doxy >/dev/null 2>../doxyissues-api2.txt')
     system_command('wc -l ../doxyissues-api2.txt')
 

diff --git a/distrib/platform_release.py b/distrib/platform_release.py
@@ -379,7 +379,7 @@ def clean_products():
     # Build dsFMOD separately.
     os.chdir('dsfmod')
     logSuffix = "%s-%s.txt" % (sys.platform, platform.architecture()[0])
-    if os.system('LD_LIBRARY_PATH=`pwd`/../builddir/libdeng2:`pwd`/../builddir/libdeng dpkg-buildpackage -b > fmod-out-%s 2> fmod-err-%s' % (logSuffix, logSuffix)):
+    if os.system('LD_LIBRARY_PATH=`pwd`/../builddir/libcore:`pwd`/../builddir/liblegacy dpkg-buildpackage -b > fmod-out-%s 2> fmod-err-%s' % (logSuffix, logSuffix)):
         raise Exception("Failure to build dsFMOD from source.")
     shutil.copy(glob.glob('../doomsday-fmod*.deb')[0], OUTPUT_DIR)
     shutil.copy(glob.glob('../doomsday-fmod*.changes')[0], OUTPUT_DIR)    

diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -52,6 +52,7 @@ Name: "{app}\doc"
 ; Obsolete files which should be removed if present when upgrading.
 [InstallDelete]
 Type: files; Name: "{app}\bin\deng1.dll"
+Type: files; Name: "{app}\bin\deng2.dll"
 Type: files; Name: "{app}\bin\libcurl.dll"
 Type: files; Name: "{app}\bin\libpng15.dll"
 Type: files; Name: "{app}\bin\SDL_net.dll"
@@ -92,11 +93,11 @@ Source: "bin\wadtool.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Component
 
 ; Libraries
 Source: "..\win32\vcredist_x86.exe"; DestDir: "{app}\bin"; Flags: ignoreversion deleteafterinstall; Components: Engine
+Source: "bin\deng_appfw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "bin\deng_core.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "bin\deng_gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\deng_legacy.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "bin\deng2.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\deng_shell.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "bin\deng_gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "bin\deng_appfw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine

diff --git a/doomsday/api/api_uri.h b/doomsday/api/api_uri.h
@@ -1,8 +1,8 @@
-/** @file api_uri.h Public API for Universal Resource Identifiers.
+/** @file api_uri.h  Public API for Universal Resource Identifiers.
  * @ingroup base
  *
- * @todo de::Uri will eventually be moved to libdeng2, at which point this API
- * is deprecated and the libdeng2 c_wrapper will provide C API functions
+ * @todo de::Uri will eventually be moved to libcore, at which point this API
+ * is deprecated and the libcore c_wrapper will provide C API functions
  * equivalent to these.
  *
  * @author Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>

diff --git a/doomsday/build/scripts/codex.py b/doomsday/build/scripts/codex.py
@@ -229,7 +229,7 @@ def fetch_commits():
     ['Test*', 'GLSandbox'],
     ['Docs', 'Documentation', 'Codex', 'Readme', 'Doxygen', 'Amethyst'],
     ['Homepage', 'Add-on Repository', 'Build Repository', 'CSS', 'RSS', 'DEW', 'Forums'],
-    ['libdeng2', 'App', 'Config', 'Log', 'LogBuffer', 'Widgets', 'Garbage', 'Garbages'],
+    ['libdeng2', 'libcore', 'App', 'Config', 'Log', 'LogBuffer', 'Widgets', 'Garbage', 'Garbages'],
     ['libgui', 'DisplayMode', 'GL', 'OpenGL', 'GL*', 'Atlas*', 'Image', '*Bank', 'Font'],
     ['libdeng', 'libdeng1', 'liblegacy', 'Str'],
     ['libshell', 'Shell', 'AbstractLineEditor', 'Link'],    

diff --git a/doomsday/build/win32/copy_to_products.py b/doomsday/build/win32/copy_to_products.py
@@ -32,7 +32,7 @@ def copy_if_newer(src, dest):
 copy_if_newer(os.path.join(solDir, 'libhexen.pk3'), os.path.join(dest, '..', 'data', 'jhexen', 'libhexen.pk3'))
 copy_if_newer(os.path.join(solDir, 'libdoom64.pk3'), os.path.join(dest, '..', 'data', 'jdoom64', 'libdoom64.pk3'))
 
-targets = ['libdeng2', 'liblegacy', 'libshell', 'libgui', 'libappfw',
+targets = ['libcore', 'liblegacy', 'libshell', 'libgui', 'libappfw',
            'client', 'server', 
            'plugins\*', 'tools\*', 'tools\shell\*', 'tests\*'] 
 

diff --git a/doomsday/build/win32/qmake_msvc.py b/doomsday/build/win32/qmake_msvc.py
@@ -53,7 +53,7 @@ def fileRegOff(fn, pattern, startAtPos=0):
     return found.start()
 
 
-for proj in ['libdeng2\deng2.vcxproj', 'tools\shell\shell-gui\Doomsday-Shell.vcxproj']:
+for proj in ['libcore\core.vcxproj', 'tools\shell\shell-gui\Doomsday-Shell.vcxproj']:
     fileRegex(proj, 
               r'=\\&quot;([A-Za-z0-9_\-\. ]+)\\&quot;', 
               r'=&quot;\1&quot;')

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -32,7 +32,7 @@ include(../dep_lzss.pri)
 win32 {
     include(../dep_directx.pri)
 }
-include(../dep_deng2.pri)
+include(../dep_core.pri)
 include(../dep_legacy.pri)
 include(../dep_shell.pri)
 include(../dep_gui.pri)
@@ -877,7 +877,7 @@ macx {
     }
 
     # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle.
-    fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng2.2.dylib, ..)
+    fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng_core.2.dylib, ..)
     fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng_legacy.1.dylib, ..)
     linkBinaryToBundledLibdengShell(Doomsday.app/Contents/MacOS/Doomsday)
 

diff --git a/doomsday/client/include/def_data.h b/doomsday/client/include/def_data.h
@@ -27,7 +27,7 @@
 #define DENG_DEFINITION_FILE_H
 
 #include <vector>
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Vector>
 
 #include "def_share.h"

diff --git a/doomsday/client/include/network/masterserver.h b/doomsday/client/include/network/masterserver.h
@@ -26,7 +26,7 @@
 
 #include "dd_share.h"
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <QObject>
 #include <QNetworkReply>
 #include <QByteArray>

diff --git a/doomsday/client/include/network/protocol.h b/doomsday/client/include/network/protocol.h
@@ -23,7 +23,7 @@
 
 /**
  * Server protocol version number.
- * @deprecated Will be replaced with the libdeng2 serialization protocol version.
+ * @deprecated Will be replaced with the libcore serialization protocol version.
  */
 #define SV_VERSION          23
 

diff --git a/doomsday/client/include/render/biasdigest.h b/doomsday/client/include/render/biasdigest.h
@@ -20,7 +20,7 @@
 #ifndef DENG_RENDER_SHADOWBIAS_DIGEST_H
 #define DENG_RENDER_SHADOWBIAS_DIGEST_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 
 /**
  * Change digest for updating trackers in the Shadow Bias lighting model.

diff --git a/doomsday/client/include/render/consoleeffect.h b/doomsday/client/include/render/consoleeffect.h
@@ -19,7 +19,7 @@
 #ifndef DENG_CLIENT_CONSOLEEFFECT_H
 #define DENG_CLIENT_CONSOLEEFFECT_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Rectangle>
 #include <de/GLShaderBank>
 

diff --git a/doomsday/client/include/render/ilightsource.h b/doomsday/client/include/render/ilightsource.h
@@ -19,7 +19,7 @@
 #ifndef DENG_CLIENT_ILIGHTSOURCE_H
 #define DENG_CLIENT_ILIGHTSOURCE_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Vector>
 
 /**

diff --git a/doomsday/client/include/render/lightgrid.h b/doomsday/client/include/render/lightgrid.h
@@ -20,7 +20,7 @@
 #ifndef DENG_CLIENT_LIGHTGRID_H
 #define DENG_CLIENT_LIGHTGRID_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Error>
 #include <de/Vector>
 #include "render/ilightsource.h"

diff --git a/doomsday/client/include/render/sky.h b/doomsday/client/include/render/sky.h
@@ -22,7 +22,7 @@
 #define DENG_CLIENT_RENDER_SKY_H
 
 #include "Material"
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Error>
 #include <de/Observers>
 #include <de/Vector>

diff --git a/doomsday/client/include/render/surfacedecorator.h b/doomsday/client/include/render/surfacedecorator.h
@@ -20,7 +20,7 @@
 #ifndef DENG_CLIENT_RENDER_SURFACEDECORATOR_H
 #define DENG_CLIENT_RENDER_SURFACEDECORATOR_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 
 class Surface;
 

diff --git a/doomsday/client/include/render/trianglestripbuilder.h b/doomsday/client/include/render/trianglestripbuilder.h
@@ -22,7 +22,7 @@
 
 #include <QVarLengthArray> /// @todo Remove me
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Vector>
 
 namespace de {

diff --git a/doomsday/client/include/resource/colorpalette.h b/doomsday/client/include/resource/colorpalette.h
@@ -20,7 +20,7 @@
 #ifndef DENG_RESOURCE_COLORPALETTE_H
 #define DENG_RESOURCE_COLORPALETTE_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Error>
 #include <de/Id>
 #include <de/Observers>

diff --git a/doomsday/client/include/ui/clientwindow.h b/doomsday/client/include/ui/clientwindow.h
@@ -52,7 +52,7 @@ class BusyWidget;
 class AlertDialog;
 
 /**
- * Top-level window that contains a libdeng2 UI widgets. @ingroup gui
+ * Top-level window that contains UI widgets. @ingroup gui
  */
 class ClientWindow : public de::BaseWindow,
                      DENG2_OBSERVES(de::Canvas, GLInit),

diff --git a/doomsday/client/include/ui/dd_input.h b/doomsday/client/include/ui/dd_input.h
@@ -211,7 +211,7 @@ byte        DD_ModKey(byte key);
 bool DD_ConvertEvent(ddevent_t const *ddEvent, event_t *ev);
 
 /**
- * Converts a libdeng2 Event into an old-fashioned ddevent_t.
+ * Converts a libcore Event into an old-fashioned ddevent_t.
  *
  * @param event    Event instance.
  * @param ddEvent  ddevent_t instance.

diff --git a/doomsday/client/include/ui/widgetactions.h b/doomsday/client/include/ui/widgetactions.h
@@ -19,7 +19,7 @@
 #ifndef CLIENT_WIDGETACTIONS_H
 #define CLIENT_WIDGETACTIONS_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Action>
 #include <de/Event>
 #include <de/GuiWidget>

diff --git a/doomsday/client/include/updater.h b/doomsday/client/include/updater.h
@@ -33,7 +33,7 @@
 
 #include "dd_types.h"
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/App>
 #include <QObject>
 #include <QNetworkReply>

diff --git a/doomsday/client/include/world/entitydatabase.h b/doomsday/client/include/world/entitydatabase.h
@@ -20,7 +20,7 @@
 #ifndef DENG_WORLD_ENTITYDATABASE_H
 #define DENG_WORLD_ENTITYDATABASE_H
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Error>
 
 #include "api_mapedit.h" // valuetype_t

diff --git a/doomsday/client/include/world/linesighttest.h b/doomsday/client/include/world/linesighttest.h
@@ -22,7 +22,7 @@
 #define DENG_WORLD_LINE_SIGHT_TEST_H
 
 #include "MapElement"
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Vector>
 
 namespace de {

diff --git a/doomsday/client/src/clientapp.cpp b/doomsday/client/src/clientapp.cpp
@@ -320,7 +320,7 @@ void ClientApp::initialize()
 
     d->svLink = new ServerLink;
 
-    // Config needs DisplayMode, so let's initialize it before the libdeng2
+    // Config needs DisplayMode, so let's initialize it before the libcore
     // subsystems and Config.
     DisplayMode_Init();
 

diff --git a/doomsday/client/src/filesys/sys_direc.cpp b/doomsday/client/src/filesys/sys_direc.cpp
@@ -1,7 +1,7 @@
 /** @file sys_direc.cpp Native file system directories.
  * @ingroup system
  *
- * @todo Rewrite using libdeng2's NativePath (and Qt).
+ * @todo Rewrite using libcore's NativePath (and Qt).
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>

diff --git a/doomsday/client/src/gl/sys_opengl.cpp b/doomsday/client/src/gl/sys_opengl.cpp
@@ -26,7 +26,7 @@
 
 #include "gl/sys_opengl.h"
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/GLInfo>
 #include <de/GLState>
 #include <QSet>

diff --git a/doomsday/client/src/library.cpp b/doomsday/client/src/library.cpp
@@ -52,7 +52,7 @@ struct library_s { // typedef Library
     Str* path;              ///< de::FS path of the library (e.g., "/bin/doom.dll").
     de::LibraryFile* file;  ///< File where the plugin has been loaded from.
     bool isGamePlugin;      ///< Is this a game plugin? (only one should be in use at a time)
-    std::string typeId;     ///< deng2 library type ID e.g., "deng-plugin/game".
+    std::string typeId;     ///< Library type ID e.g., "deng-plugin/game".
 
     library_s() : path(0), file(0), isGamePlugin(false) {}
 };

diff --git a/doomsday/client/src/render/cameralensfx.cpp b/doomsday/client/src/render/cameralensfx.cpp
@@ -50,7 +50,7 @@
 
 #include "ui/clientwindow.h"
 
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Rectangle>
 #include <de/Drawable>
 #include <de/GLTarget>

diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp
@@ -27,7 +27,7 @@
 #include <QBitArray>
 
 #include <de/vector1.h>
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/GLState>
 
 #include "de_base.h"

diff --git a/doomsday/client/src/resource/patch.cpp b/doomsday/client/src/resource/patch.cpp
@@ -20,7 +20,7 @@
 
 #include <QList>
 #include <QRect>
-#include <de/libdeng2.h>
+#include <de/libcore.h>
 #include <de/Log>
 
 #include "resource/patch.h"

diff --git a/doomsday/client/src/updater/updatersettings.cpp b/doomsday/client/src/updater/updatersettings.cpp
@@ -46,42 +46,6 @@ using namespace de;
 
 #define SYMBOL_DEFAULT_DOWNLOAD "${DEFAULT}"
 
-#if 0
-void UpdaterSettings::initialize()
-{
-    Config &config = App::config();
-
-    if(!config.names().has(SUBREC_NAME))
-    {
-        /**
-         * @todo These defaults can be moved to Config.de when libdeng2 has
-         * knowledge of the release type.
-         */
-
-        // Looks like we don't have existing values stored. Let's set up a
-        // Record with the defaults.
-        Record *s = new Record;
-
-        s->addNumber(VAR_FREQUENCY, Weekly);
-        s->addNumber(VAR_CHANNEL, QString(DOOMSDAY_RELEASE_TYPE) == "Stable"? Stable : Unstable);
-        s->addTime(VAR_LAST_CHECKED, Time::invalidTime());
-
-        bool checkByDefault = false;
-#if defined(UNIX) && !defined(MACOSX)
-        // On Unix platforms don't do automatic checks by default.
-        checkByDefault = true;
-#endif
-        s->addBoolean(VAR_ONLY_MANUAL, checkByDefault);
-
-        s->addBoolean(VAR_DELETE, true);
-        s->addText(VAR_DELETE_PATH, "");
-        s->addText(VAR_DOWNLOAD_PATH, SYMBOL_DEFAULT_DOWNLOAD);
-
-        config.names().add(SUBREC_NAME, s);
-    }
-}
-#endif
-
 UpdaterSettings::UpdaterSettings()
 {}
 

diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -28,9 +28,9 @@
 # - deng_notools                Do not build and deploy the tools
 # - deng_openal                 Build the OpenAL sound driver
 # - deng_qtautoselect           (Mac) Select OS X SDK based on Qt version
-# - deng_qtgui                  Use the QtGui module in dep_deng2.pri
-# - deng_qtopengl               Use the QtOpenGL module in dep_deng2.pri
-# - deng_qtwidgets              Use the QtWidgets module in dep_deng2.pri
+# - deng_qtgui                  Use the QtGui module in dep_core.pri
+# - deng_qtopengl               Use the QtOpenGL module in dep_core.pri
+# - deng_qtwidgets              Use the QtWidgets module in dep_core.pri
 # - deng_nopackres              Do not package the Doomsday resources
 # - deng_rangecheck             Parameter range checking/value assertions
 # - deng_snowberry              (Unix) Include Snowberry in installation
@@ -50,7 +50,7 @@ DENG_INCLUDE_DIR      = $$PWD/client/include
 DENG_UNIX_INCLUDE_DIR = $$DENG_INCLUDE_DIR/unix
 DENG_MAC_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/macx
 DENG_WIN_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/windows
-DENG_MODULES_DIR      = $$PWD/libdeng2/modules
+DENG_MODULES_DIR      = $$PWD/libcore/modules
 
 # Macros ---------------------------------------------------------------------