Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine

distrib/builder/event.py

@@ -35,12 +35,20 @@ def __init__(self, build=None):
         self.packageName = {'doomsday': 'Doomsday',
                             'fmod':     'FMOD Ex Audio Plugin'}
 
-        # Platforms:  Name                            File ext     sys_id()
-        self.oses = [('Windows (x86)',                '.exe',      'win32-32bit'),
-                     ('Mac OS X 10.4+ (ppc/i386)',    '.dmg',      'darwin-32bit'),
-                     ('Mac OS X 10.6+ (x86_64/i386)', '64bit.dmg', 'darwin-64bit'),
-                     ('Ubuntu (x86)',                 'i386.deb',  'linux2-32bit'),
-                     ('Ubuntu (x86_64)',              'amd64.deb', 'linux2-64bit')]
+        if self.num >= 778: # Mac distribution naming was changed.
+            # Platforms:  Name                            File ext     sys_id()
+            self.oses = [('Windows (x86)',                '.exe',      'win32-32bit'),
+                         ('Mac OS X 10.6+ (x86_64/i386)', '.dmg',      'darwin-64bit'),
+                         ('Mac OS X 10.4+ (ppc/i386)',    '32bit.dmg', 'darwin-32bit'),
+                         ('Ubuntu (x86_64)',              'amd64.deb', 'linux2-64bit'),
+                         ('Ubuntu (x86)',                 'i386.deb',  'linux2-32bit')]
+        else:
+            # Platforms:  Name                            File ext     sys_id()
+            self.oses = [('Windows (x86)',                '.exe',      'win32-32bit'),
+                         ('Mac OS X 10.4+ (ppc/i386)',    '.dmg',      'darwin-32bit'),
+                         ('Mac OS X 10.6+ (x86_64/i386)', '64bit.dmg', 'darwin-64bit'),
+                         ('Ubuntu (x86)',                 'i386.deb',  'linux2-32bit'),
+                         ('Ubuntu (x86_64)',              'amd64.deb', 'linux2-64bit')]            
 
         self.platId = {'win32-32bit':  'win-x86',
                        'darwin-32bit': 'mac10_4-x86-ppc',

distrib/linux/doomsday-shell.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Doomsday Shell
+Comment=Shell for Doomsday Engine servers
+Categories=Game;ActionGame;
+Exec=BIN_DIR/doomsday-shell
+Terminal=false
+Type=Application
+Icon=BASE_DIR/icons/shell.png
+
+Name[en_US]=doomsday-shell.desktop

distrib/platform_release.py

@@ -100,8 +100,8 @@ def mac_os_version():
 
 
 def mac_target_ext():
-    if mac_os_version() == '10.6': return '_64bit.dmg'
-    return '.dmg'
+    if mac_os_version() == '10.6': return '.dmg'
+    return '_32bit.dmg'
 
 
 def output_filename(ext=''):
@@ -223,16 +223,25 @@ def mac_release():
         # Exclude jDoom64.
         if not 'jDoom64' in f:
             duptree(f, 'Doomsday Engine.app/Contents/' + os.path.basename(f))
+    duptree(os.path.join(MAC_WORK_DIR, 'tools/shell/shell-gui/Doomsday Shell.app'), 'Doomsday Shell.app')
+
+    print 'Correcting permissions...'
+    os.system('chmod -R o-w "Doomsday Engine.app"')
+    os.system('chmod -R o-w "Doomsday Shell.app"')
 
     print 'Signing Doomsday.app...'
     os.system('codesign --verbose -s "Developer ID Application: Jaakko Keranen" "Doomsday Engine.app/Contents/Doomsday.app"')
 
     print 'Signing Doomsday Engine.app...'
     os.system('codesign --verbose -s "Developer ID Application: Jaakko Keranen" "Doomsday Engine.app"')
 
-    print 'Creating disk image:', target
+    print 'Signing Doomsday Shell.app...'
+    os.system('codesign --verbose -s "Developer ID Application: Jaakko Keranen" "Doomsday Shell.app"')
 
-    masterDmg = target
+    print 'Creating disk:', target
+    os.system('osascript /Users/jaakko/Dropbox/Doomsday/package-installer.applescript')
+
+    masterPkg = target
     volumeName = "Doomsday Engine " + DOOMSDAY_VERSION_FULL
     templateFile = os.path.join(SNOWBERRY_DIR, 'template-image/template.sparseimage')
     if not os.path.exists(templateFile):
@@ -241,14 +250,11 @@ def mac_release():
     shutil.copy(templateFile, 'imaging.sparseimage')
     remkdir('imaging')
     os.system('hdiutil attach imaging.sparseimage -noautoopen -quiet -mountpoint imaging')
-    shutil.rmtree('imaging/Doomsday Engine.app', True)
-    remove('imaging/Read Me.rtf')
-    duptree('Doomsday Engine.app', 'imaging/Doomsday Engine.app')
+    shutil.copy('/Users/jaakko/Desktop/Doomsday.pkg', 'imaging/Doomsday.pkg')
     shutil.copy(os.path.join(DOOMSDAY_DIR, "doc/output/Read Me.rtf"), 'imaging/Read Me.rtf')
 
     volumeName = "Doomsday Engine " + DOOMSDAY_VERSION_FULL
     os.system('/usr/sbin/diskutil rename ' + os.path.abspath('imaging') + ' "' + volumeName + '"')
-    #os.system("osascript %s/template-image/template.applescript \"%s\"" % (SNOWBERRY_DIR, volumeName))
 
     os.system('hdiutil detach -quiet imaging')
     os.system('hdiutil convert imaging.sparseimage -format UDZO -imagekey zlib-level=9 -o "' + target + '"')

distrib/win32/dorel.bat

@@ -36,7 +36,11 @@ REM -- Update readme (could also run Amethyst here).
 copy "C:\Users\Virtual\Dropbox\Doomsday\readme\readme.txt" ..\products\doc
 
 REM -- Run the Inno Setup Compiler.
-"C:\Program Files\Inno Setup 5\Compil32.exe" /cc setup.iss
+IF EXIST "c:\Program Files\Inno Setup 5\Compil32.exe" (
+    "C:\Program Files\Inno Setup 5\Compil32.exe" /cc setup.iss
+) ELSE (
+    "C:\Program Files (x86)\Inno Setup 5\Compil32.exe" /cc setup.iss
+)
 
 goto TheEnd
 

distrib/win32/setup.iss.template

@@ -154,9 +154,11 @@ Filename: "{app}\doomsday.url"; Section: "InternetShortcut"; Key: "URL"; String:
 
 [Icons]
 Name: "{group}\Doomsday Engine"; Filename: "{app}\snowberry\snowberry.exe"; WorkingDir: "{app}\snowberry"; Flags: createonlyiffileexists
+Name: "{group}\Doomsday Shell"; Filename: "{app}\bin\doomsday-shell.exe"; WorkingDir: "{app}"; Flags: createonlyiffileexists
 Name: "{group}\{cm:ProgramOnTheWeb,Doomsday Engine}"; Filename: "{app}\doomsday.url"
 Name: "{group}\{cm:UninstallProgram,Doomsday Engine}"; Filename: "{uninstallexe}"
 Name: "{userdesktop}\Doomsday Engine"; Filename: "{app}\snowberry\snowberry.exe"; WorkingDir: "{app}\snowberry"; Tasks: desktopicon; Flags: createonlyiffileexists
+Name: "{userdesktop}\Doomsday Shell"; Filename: "{app}\bin\doomsday-shell.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Flags: createonlyiffileexists
 
 [Run]
 Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q"; Flags: runascurrentuser

doomsday/api/dd_types.h

@@ -49,6 +49,9 @@
 #  endif
 #endif
 
+/// Each network node is identified by a number.
+typedef unsigned int nodeid_t;
+
 /// @todo Should be a public typedef of a type defined by de::LumpIndex.
 typedef int32_t         lumpnum_t;
 #define LUMPNAME_T_MAXLEN 9

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',
+targets = ['libdeng2', 'libdeng1', 'libshell', 'libgui',
            'client', 'server', 
            'plugins\*', 'tools\*', 'tools\shell\*', 'tests\*'] 
 

doomsday/client/client.pro

@@ -33,6 +33,7 @@ win32 {
     include(../dep_directx.pri)
 }
 include(../dep_deng2.pri)
+include(../dep_shell.pri)
 include(../dep_gui.pri)
 include(../dep_deng1.pri)
 
@@ -268,6 +269,7 @@ DENG_HEADERS += \
     include/network/net_main.h \
     include/network/net_msg.h \
     include/network/protocol.h \
+    include/network/serverlink.h \
     include/network/sys_network.h \
     include/network/ui_mpi.h \
     include/r_util.h \
@@ -544,7 +546,7 @@ SOURCES += \
     src/network/net_main.cpp \
     src/network/net_msg.cpp \
     src/network/net_ping.cpp \
-    src/network/protocol.cpp \
+    src/network/serverlink.cpp \
     src/network/sys_network.cpp \
     src/network/ui_mpi.cpp \
     src/r_util.cpp \
@@ -690,7 +692,7 @@ macx {
 
     QMAKE_BUNDLE_DATA += mod res data startupfonts startupgfx
 
-    QMAKE_INFO_PLIST = ../build/mac/Info.plist
+    QMAKE_INFO_PLIST = res/macx/Info.plist
 
     # Since qmake is unable to copy directories as bundle data, let's copy
     # the frameworks manually.
@@ -710,6 +712,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, ..)
+    linkBinaryToBundledLibdengShell(Doomsday.app/Contents/MacOS/Doomsday)
 
     # Clean up previous deployment.
     doPostLink("rm -rf Doomsday.app/Contents/PlugIns/")

doomsday/client/include/de_network.h

@@ -29,6 +29,7 @@
 #include "network/net_msg.h"
 #include "network/net_buf.h"
 #include "network/protocol.h"
+#include "network/monitor.h"
 
 #ifdef __SERVER__
 #  include "server/sv_def.h"
@@ -40,8 +41,8 @@
 #endif
 
 #ifdef __CLIENT__
-#  include "network/net_demo.h"
 #  include "api_client.h"
+#  include "network/net_demo.h"
 #  include "client/cl_def.h"
 #  include "client/cl_player.h"
 #  include "client/cl_mobj.h"