Refactor: Renamed libdeng1 to liblegacy (deng_legacy)

skyjake · May 2, 2014 · c871117 · c871117
1 parent 5b376f9
commit c871117
Show file tree

Hide file tree

Showing 91 changed files with 115 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ For [compilation instructions](http://dengine.net/dew/index.php?title=Compilatio
 
 **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.
 
-**libdeng1** 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 libdeng2. (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.
 

diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -51,6 +51,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\libcurl.dll"
 Type: files; Name: "{app}\bin\libpng15.dll"
 Type: files; Name: "{app}\bin\SDL_net.dll"
@@ -91,7 +92,7 @@ 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\deng1.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

diff --git a/doomsday/api/README b/doomsday/api/README
@@ -9,4 +9,4 @@ and accessing the engine's runtime functionality.
 Note that in the future, more and more of this functionality will be moving
 into the shared libraries.
 
-See also: libdeng1, libdeng2
+See also: libcore, liblegacy
diff --git a/doomsday/api/apis.h b/doomsday/api/apis.h
@@ -21,7 +21,7 @@
 #define DOOMSDAY_APIS_H
 
 #ifndef RC_INVOKED
-#  include <de/libdeng1.h>
+#  include <de/liblegacy.h>
 #  include <string.h>
 #endif
 

diff --git a/doomsday/build/scripts/codex.py b/doomsday/build/scripts/codex.py
@@ -229,9 +229,9 @@ 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'],
+    ['libdeng2', 'App', 'Config', 'Log', 'LogBuffer', 'Widgets', 'Garbage', 'Garbages'],
     ['libgui', 'DisplayMode', 'GL', 'OpenGL', 'GL*', 'Atlas*', 'Image', '*Bank', 'Font'],
-    ['libdeng', 'libdeng1', 'Garbage', 'Garbages', 'Str'],
+    ['libdeng', 'libdeng1', 'liblegacy', 'Str'],
     ['libshell', 'Shell', 'AbstractLineEditor', 'Link'],    
     ['Client', 'Client UI', 'UI', 'Console', 'Control Panel', 'Default Style', 'GameSelectionWidget',
      'Task Bar', 'Updater', 'WindowSystem', 'Client*'],

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', 'libdeng1', 'libshell', 'libgui',
+targets = ['libdeng2', '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
@@ -59,7 +59,7 @@ def fileRegOff(fn, pattern, startAtPos=0):
               r'=&quot;\1&quot;')
 
 copyScript = 'python &quot;%s\\\\build\win32\copy_to_products.py' % rootPath + '&quot; &quot;' + solPath + '&quot;'
-rcDirs = '&quot;' + rootPath + '\\\\api&quot;;&quot;' + rootPath + '\\\\libdeng1\include' + '&quot;'
+rcDirs = '&quot;' + rootPath + '\\\\api&quot;;&quot;' + rootPath + '\\\\liblegacy\include' + '&quot;'
 
 def find_projs(path):
     found = []

diff --git a/doomsday/client/api.doxy b/doomsday/client/api.doxy
@@ -1,12 +1,12 @@
-# Public API documentation for Doomsday and libdeng1
+# Public API documentation for Doomsday and liblegacy
 @INCLUDE = ../doomsday.doxy
 
-PROJECT_NAME            = "Doomsday and libdeng1"
+PROJECT_NAME            = "Doomsday and liblegacy"
 PROJECT_NUMBER          = 1.15
 PROJECT_BRIEF           = "Public API"
 OUTPUT_DIRECTORY        = ../apidoc/api/
 
-INPUT                   = ../api ../libdeng1/include
+INPUT                   = ../api ../liblegacy/include
 PREDEFINED              = __DOOMSDAY__ __DENG__ \
                           "DENG_API_TYPEDEF(Name)=typedef struct de_api_##Name##_s" \
                           "DENG_API_T(Name)=de_api_##Name##_t" \

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -33,7 +33,7 @@ win32 {
     include(../dep_directx.pri)
 }
 include(../dep_deng2.pri)
-include(../dep_deng1.pri)
+include(../dep_legacy.pri)
 include(../dep_shell.pri)
 include(../dep_gui.pri)
 include(../dep_appfw.pri)
@@ -878,7 +878,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, libdeng1.1.dylib, ..)
+    fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng_legacy.1.dylib, ..)
     linkBinaryToBundledLibdengShell(Doomsday.app/Contents/MacOS/Doomsday)
 
     # Clean up previous deployment.

diff --git a/doomsday/client/include/audio/sys_audiod_dummy.h b/doomsday/client/include/audio/sys_audiod_dummy.h
@@ -26,7 +26,7 @@
 #ifndef __DOOMSDAY_SYSTEM_AUDIO_DUMMY_H__
 #define __DOOMSDAY_SYSTEM_AUDIO_DUMMY_H__
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include "api_audiod.h"
 #include "api_audiod_sfx.h"
 

diff --git a/doomsday/client/include/audio/sys_audiod_sdlmixer.h b/doomsday/client/include/audio/sys_audiod_sdlmixer.h
@@ -27,7 +27,7 @@
 #ifndef __DOOMSDAY_SYSTEM_AUDIO_SDLMIXER_H__
 #define __DOOMSDAY_SYSTEM_AUDIO_SDLMIXER_H__
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include "api_audiod.h"
 #include "api_audiod_sfx.h"
 #include "api_audiod_mus.h"

diff --git a/doomsday/client/include/edit_bias.h b/doomsday/client/include/edit_bias.h
@@ -22,7 +22,7 @@
 
 #ifdef __CLIENT__
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 
 class HueCircle;
 

diff --git a/doomsday/client/include/render/blockmapvisual.h b/doomsday/client/include/render/blockmapvisual.h
@@ -21,7 +21,7 @@
 #ifndef DENG_CLIENT_RENDER_BLOCKMAPVISUAL_H
 #define DENG_CLIENT_RENDER_BLOCKMAPVISUAL_H
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 
 DENG_EXTERN_C byte bmapShowDebug; ///< cvar
 DENG_EXTERN_C float bmapDebugSize; ///< cvar

diff --git a/doomsday/client/include/render/rendpoly.h b/doomsday/client/include/render/rendpoly.h
@@ -22,7 +22,7 @@
 #ifndef DENG_RENDER_RENDPOLY_H
 #define DENG_RENDER_RENDPOLY_H
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include <de/Vector>
 
 DENG_EXTERN_C byte rendInfoRPolys;

diff --git a/doomsday/client/include/world/worldsystem.h b/doomsday/client/include/world/worldsystem.h
@@ -31,7 +31,7 @@
 #define DENG_WORLDSYSTEM_H
 
 #include "uri.hh"
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include <de/Error>
 #include <de/Observers>
 #include <de/System>

diff --git a/doomsday/client/src/ui/zonedebug.cpp b/doomsday/client/src/ui/zonedebug.cpp
@@ -34,7 +34,7 @@
 
 /// @todo Find a better way to access the private data of the zone
 /// (e.g., move this into the library and use an abstract graphics interface).
-#include "../../libdeng1/src/memoryzone_private.h"
+#include "../../liblegacy/src/memoryzone_private.h"
 
 using namespace de;
 

diff --git a/doomsday/dep_deng1.pri b/doomsday/dep_deng1.pri
diff --git a/doomsday/dep_legacy.pri b/doomsday/dep_legacy.pri
@@ -0,0 +1,26 @@
+# Build configuration for using C/legacy support.
+LIBDENG_INCLUDE_DIR = $$PWD/liblegacy/include
+INCLUDEPATH += $$LIBDENG_INCLUDE_DIR
+
+win32 {
+    # Tell rc where to get the API headers.
+    QMAKE_RC = $$QMAKE_RC /I \"$$LIBDENG_INCLUDE_DIR\"
+}
+
+# Use the appropriate library path (trying some alternatives).
+!useLibDir($$OUT_PWD/../liblegacy) {
+    !useLibDir($$OUT_PWD/../../liblegacy) {
+        useLibDir($$OUT_PWD/../../builddir/liblegacy)
+    }
+}
+
+LIBS += -ldeng_legacy
+
+macx {
+    defineTest(linkBinaryToBundledLiblegacy) {
+        fixInstallName($${1}, libdeng_legacy.1.dylib, ..)
+    }
+    defineTest(linkToBundledLiblegacy) {
+        fixInstallName($${1}.bundle/$$1, libdeng_legacy.1.dylib, ..)
+    }
+}
diff --git a/doomsday/doomsday.pro b/doomsday/doomsday.pro
@@ -10,7 +10,7 @@ CONFIG += ordered
 SUBDIRS = \
     build \
     libdeng2 \
-    libdeng1 \
+    liblegacy \
     libshell
 
 !deng_noclient|macx {

diff --git a/doomsday/libdeng2/include/de/core/version.h b/doomsday/libdeng2/include/de/core/version.h
@@ -30,14 +30,13 @@
 namespace de {
 
 /**
- * Version information about libdeng2. The version numbers are defined in
- * libdeng2.pro.
+ * Version information about libdeng2. The version numbers are defined in libdeng2.pro.
  *
- * @note For the time being, this is separate from the libdeng1/engine version
- * number. libdeng2 versioning starts from 2.0.0. When the project as a whole
- * switches to major version 2, libdeng2 version will be synced with the rest
- * of the project. Also note that unlike libdeng1, there is only ever three
- * components in the version (or four, counting the build number).
+ * @note For the time being, this is separate from the project version number. libdeng2
+ * versioning starts from 2.0.0. When the project as a whole switches to major version 2,
+ * libdeng2 version will be synced with the rest of the project. Also note that unlike in
+ * the past, there is only ever three components in the version (or four, counting the
+ * build number).
  *
  * @ingroup core
  */

diff --git a/doomsday/libdeng2/src/core/commandline.cpp b/doomsday/libdeng2/src/core/commandline.cpp
@@ -288,7 +288,7 @@ void CommandLine::makeAbsolutePath(duint pos)
         QFileInfo info(dir.path());
         if(info.isDir())
         {
-            // Append a slash so libdeng1 will treat it as a directory.
+            // Append a slash so FS1 will treat it as a directory.
             d->arguments[pos] += '/';
         }
 

diff --git a/doomsday/libdeng1/include/de/aabox.h → doomsday/liblegacy/include/de/aabox.h b/doomsday/libdeng1/include/de/aabox.h → doomsday/liblegacy/include/de/aabox.h
diff --git a/doomsday/libdeng1/include/de/animator.h → doomsday/liblegacy/include/de/animator.h b/doomsday/libdeng1/include/de/animator.h → doomsday/liblegacy/include/de/animator.h
@@ -26,7 +26,7 @@
 #ifndef LIBDENG_ANIMATOR_H
 #define LIBDENG_ANIMATOR_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 
 /// @addtogroup math
 ///@{

diff --git a/doomsday/libdeng1/include/de/binangle.h → doomsday/liblegacy/include/de/binangle.h b/doomsday/libdeng1/include/de/binangle.h → doomsday/liblegacy/include/de/binangle.h
@@ -22,7 +22,7 @@
 #ifndef LIBDENG_BAMS_MATH_H
 #define LIBDENG_BAMS_MATH_H
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include <de/types.h>
 
 #ifdef __cplusplus

diff --git a/doomsday/libdeng1/include/de/concurrency.h → doomsday/liblegacy/include/de/concurrency.h b/doomsday/libdeng1/include/de/concurrency.h → doomsday/liblegacy/include/de/concurrency.h
@@ -24,7 +24,7 @@
 #ifndef LIBDENG_SYSTEM_CONCURRENCY_H
 #define LIBDENG_SYSTEM_CONCURRENCY_H
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 
 typedef void *thread_t;
 typedef int (*systhreadfunc_t) (void *parm);

diff --git a/doomsday/libdeng1/include/de/ddstring.h → doomsday/liblegacy/include/de/ddstring.h b/doomsday/libdeng1/include/de/ddstring.h → doomsday/liblegacy/include/de/ddstring.h
diff --git a/doomsday/libdeng1/include/de/findfile.h → doomsday/liblegacy/include/de/findfile.h b/doomsday/libdeng1/include/de/findfile.h → doomsday/liblegacy/include/de/findfile.h
diff --git a/doomsday/libdeng1/include/de/fixedpoint.h → doomsday/liblegacy/include/de/fixedpoint.h b/doomsday/libdeng1/include/de/fixedpoint.h → doomsday/liblegacy/include/de/fixedpoint.h
@@ -24,7 +24,7 @@
 #ifndef LIBDENG_FIXED_POINT_MATH_H
 #define LIBDENG_FIXED_POINT_MATH_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 
 #define FRACBITS        16
 #define FRACUNIT        (1 << FRACBITS)

diff --git a/doomsday/libdeng1/include/de/kdtree.h → doomsday/liblegacy/include/de/kdtree.h b/doomsday/libdeng1/include/de/kdtree.h → doomsday/liblegacy/include/de/kdtree.h
diff --git a/doomsday/libdeng1/include/de/libdeng1.h → doomsday/liblegacy/include/de/liblegacy.h b/doomsday/libdeng1/include/de/libdeng1.h → doomsday/liblegacy/include/de/liblegacy.h
@@ -1,6 +1,6 @@
-/** @file libdeng1.h Common definitions for libdeng1.
+/** @file liblegacy.h  Common definitions for legacy support.
  *
- * @authors Copyright © 2012-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2012-2014 Jaakko Keränen <jaakko.keranen@iki.fi>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -17,8 +17,8 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef LIBDENG1_H
-#define LIBDENG1_H
+#ifndef LIBLEGACY_H
+#define LIBLEGACY_H
 
 #if defined(__cplusplus) && !defined(DENG_NO_QT)
 #  define DENG_USE_QT
@@ -135,15 +135,14 @@ extern "C" {
 #endif
 
 /**
- * Initializes the libdeng1 library. This must be the first function called
- * before any other libdeng1 functions.
+ * Initializes the library. This must be the first function called before any other
+ * functions in the library.
  */
 DENG_PUBLIC void Libdeng_Init(void);
 
 /**
- * Shuts down the libdeng1 library. Frees any internal resources allocated by
- * the library's subsystems. Must be called when the library is no longer
- * needed.
+ * Shuts down the library. Frees any internal resources allocated by the library's
+ * subsystems. Must be called when the library is no longer needed.
  */
 DENG_PUBLIC void Libdeng_Shutdown(void);
 
@@ -157,4 +156,4 @@ DENG_PUBLIC void Libdeng_BadAlloc(void);
 } // extern "C"
 #endif
 
-#endif // LIBDENG1_H
+#endif // LIBLEGACY_H
diff --git a/doomsday/libdeng1/include/de/mathutil.h → doomsday/liblegacy/include/de/mathutil.h b/doomsday/libdeng1/include/de/mathutil.h → doomsday/liblegacy/include/de/mathutil.h
@@ -21,7 +21,7 @@
 #ifndef LIBDENG_MATHUTIL_H
 #define LIBDENG_MATHUTIL_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/doomsday/libdeng1/include/de/memory.h → doomsday/liblegacy/include/de/memory.h b/doomsday/libdeng1/include/de/memory.h → doomsday/liblegacy/include/de/memory.h
@@ -23,7 +23,7 @@
 #ifndef LIBDENG_SYSTEM_MEMORY_H
 #define LIBDENG_SYSTEM_MEMORY_H
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 #include <string.h> // memcpy
 
 #ifdef __cplusplus

diff --git a/...sday/libdeng1/include/de/memoryblockset.h → ...day/liblegacy/include/de/memoryblockset.h b/...sday/libdeng1/include/de/memoryblockset.h → ...day/liblegacy/include/de/memoryblockset.h
@@ -23,7 +23,7 @@
 #ifndef LIBDENG_MEMORY_BLOCKSET_H
 #define LIBDENG_MEMORY_BLOCKSET_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/doomsday/libdeng1/include/de/memoryzone.h → doomsday/liblegacy/include/de/memoryzone.h b/doomsday/libdeng1/include/de/memoryzone.h → doomsday/liblegacy/include/de/memoryzone.h
@@ -33,7 +33,7 @@
  * @ingroup base
  */
 
-#include <de/libdeng1.h>
+#include <de/liblegacy.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/doomsday/libdeng1/include/de/point.h → doomsday/liblegacy/include/de/point.h b/doomsday/libdeng1/include/de/point.h → doomsday/liblegacy/include/de/point.h
@@ -22,7 +22,7 @@
 #ifndef LIBDENG_DATA_POINT_H
 #define LIBDENG_DATA_POINT_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/doomsday/libdeng1/include/de/reader.h → doomsday/liblegacy/include/de/reader.h b/doomsday/libdeng1/include/de/reader.h → doomsday/liblegacy/include/de/reader.h
@@ -35,7 +35,7 @@
 #ifndef LIBDENG_READER_H
 #define LIBDENG_READER_H
 
-#include "libdeng1.h"
+#include "liblegacy.h"
 #include "types.h"
 
 #ifdef __cplusplus

diff --git a/doomsday/libdeng1/include/de/rect.h → doomsday/liblegacy/include/de/rect.h b/doomsday/libdeng1/include/de/rect.h → doomsday/liblegacy/include/de/rect.h