Merge branch 'packageloader'

doomsday/build/scripts/packres.py

@@ -68,27 +68,28 @@ def process_dir(path, dest_path):
 # Directory contents added recursively.
 p = Pack()
 p.add_files(
-    [ ('client/defs', 'defs'),
-      ('client/data', 'data') ] )
+    [ ('client/data', 'data') ] )
 p.create('doomsday.pk3')
 
-# defaultstyle.pack
+# net.dengine.base.pack
 p = Pack()
-p.add_files(
-    [ ('client/data/defaultstyle.pack', '') ] )
-p.create('defaultstyle.pack')
+p.add_files( [ ('net.dengine.base.pack', '') ] )
+p.create('net.dengine.base.pack')
 
-# renderer.pack
+# net.dengine.stdlib.pack
 p = Pack()
-p.add_files(
-    [ ('client/data/renderer.pack', '') ] )
-p.create('renderer.pack')
+p.add_files( [ ('libcore/net.dengine.stdlib.pack', '') ] )
+p.create('net.dengine.stdlib.pack')
 
-# lensflares.pack
+# net.dengine.stdlib.gui.pack
 p = Pack()
-p.add_files(
-    [ ('client/data/lensflares.pack', '') ] )
-p.create('lensflares.pack')
+p.add_files( [ ('libgui/net.dengine.stdlib.gui.pack', '') ] )
+p.create('net.dengine.stdlib.gui.pack')
+
+# net.dengine.client.pack
+p = Pack()
+p.add_files( [ ('client/net.dengine.client.pack', '') ] )
+p.create('net.dengine.client.pack')
 
 # libdoom.pk3
 p = Pack()

doomsday/client/client.pro

@@ -772,14 +772,7 @@ SOURCES += \
     SOURCES += src/audio/sys_audiod_sdlmixer.cpp
 }
 
-DOOMSDAY_SCRIPTS += \
-    modules/appconfig.de \
-    modules/bootstrap.de \
-    modules/Updater.de
-
 OTHER_FILES += \
-    $$DOOMSDAY_SCRIPTS \
-    data/cphelp.txt \
     include/template.h.template \
     src/template.c.template \
     client-mac.doxy \
@@ -789,13 +782,6 @@ OTHER_FILES += \
 
 data.files = $$OUT_PWD/../doomsday.pk3
 
-mod.files = \
-    $$DOOMSDAY_SCRIPTS \
-    $$DENG_MODULES_DIR/Config.de \
-    $$DENG_MODULES_DIR/Log.de \
-    $$DENG_MODULES_DIR/recutil.de \
-    $$DENG_MODULES_DIR/../../libgui/modules/gui.de
-
 # These fonts may be needed during the initial startup busy mode.
 startupfonts.files = \
     data/fonts/console11.dfn \
@@ -818,10 +804,9 @@ macx {
         res/macx/deng.icns
 
     data.path         = $${res.path}
-    mod.path          = $${res.path}/modules
     startupfonts.path = $${res.path}/data/fonts
 
-    QMAKE_BUNDLE_DATA += mod res data startupfonts
+    QMAKE_BUNDLE_DATA += res data startupfonts
 
     QMAKE_INFO_PLIST = res/macx/Info.plist
 
@@ -831,8 +816,8 @@ macx {
     doPostLink("rm -rf $$FW_DIR")
     doPostLink("mkdir $$FW_DIR")
     !deng_nosdl {
-        doPostLink("cp -fRp $${SDL_FRAMEWORK_DIR}/SDL2.framework $$FW_DIR")
-        !deng_nosdlmixer: doPostLink("cp -fRp $${SDL_FRAMEWORK_DIR}/SDL2_mixer.framework $$FW_DIR")
+        doPostLink("cp -fRp $${SDL2_FRAMEWORK_DIR}/SDL2.framework $$FW_DIR")
+        !deng_nosdlmixer: doPostLink("cp -fRp $${SDL2_FRAMEWORK_DIR}/SDL2_mixer.framework $$FW_DIR")
     }
     deng_fmod {
         # Bundle the FMOD shared library under Frameworks.
@@ -858,14 +843,17 @@ macx {
 
 # Installation ---------------------------------------------------------------
 
+DENG_PACKAGES += net.dengine.client.pack
+
+deployPackages($$DENG_PACKAGES, $$OUT_PWD/..)
+
 !macx {
     # Common (non-Mac) parts of the installation.
-    INSTALLS += target data startupfonts mod
+    INSTALLS += target data startupfonts
 
     target.path       = $$DENG_BIN_DIR
     data.path         = $$DENG_DATA_DIR
     startupfonts.path = $$DENG_DATA_DIR/fonts
-    mod.path          = $$DENG_BASE_DIR/modules
 
     win32 {
         # Windows-specific installation.

doomsday/client/net.dengine.client.pack/Info

@@ -0,0 +1,8 @@
+# Client's primary resources
+
+title: Doomsday Client
+version: 1.15.0
+license: GPL 3+
+tags: core client
+
+importPath <modules>

doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info

@@ -0,0 +1,4 @@
+title: Doomsday Default UI Style
+version: 1.15.0
+license: GPL 3+
+tags: ui style

doomsday/client/data/defaultstyle.pack/fonts.dei → doomsday/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei

@@ -1,8 +1,10 @@
 # Fonts for the default UI style
 #
+# - family: font family name
 # - size can be "pt" or "px", defaults to "pt" 
-# - weight: normal bold light
-# - style: normal italic
+# - weight: normal, bold, light
+# - style: normal, italic
+# - transform: normal, uppercase, lowercase
 
 script { 
     import Version, gui 
@@ -40,7 +42,7 @@ group {
 
     script {
         # Define mappings for native font styles and weights.
-        import App
+        import App, DisplayMode
         App.addFontMapping("Helvetica Neue", {
             ['regular', 25]: 'HelveticaNeue-Light',
             ['regular', 50]: 'HelveticaNeue',
@@ -61,14 +63,14 @@ group {
 
     font default {
         family: Helvetica Neue
-        size: 16pt
+        size $: gui.scale('16pt', DisplayMode.DPI_FACTOR)
         weight: normal
         style: normal
     }
 
     font monospace inherits default {
         family: Menlo
-        size: 13pt
+        size $: gui.scale('13pt', DisplayMode.DPI_FACTOR)
     }
 }
 
@@ -115,7 +117,7 @@ group separator {
     }
     font label inherits default {
         size $: gui.scale(self.size, 0.7)
-        weight: bold
+        transform: uppercase
     }
     font annotation inherits small {}    
 }

doomsday/client/data/defaultstyle.pack/images.dei → doomsday/client/net.dengine.client.pack/defaultstyle.pack/images.dei

@@ -1,5 +1,7 @@
 # Images for the default UI style
 
+script { import DisplayMode }
+
 group window {
     image background { path = "graphics/background.jpg" }
     image borderglow { path = "graphics/borderglow.png" }
@@ -10,7 +12,13 @@ group window {
 group logo {
     image px128 { path = "graphics/deng-logo-128.png" }
     image px256 { path = "graphics/deng-logo-256.png" }
-    image px512 { path = "graphics/deng-logo-512.png" }    
+
+    # With HiDPI displays use the 2x versions of the logo.
+    group {    
+        condition: DisplayMode.DPI_FACTOR == 2
+        image px128 { path = "graphics/deng-logo-256.png" }
+        image px256 { path = "graphics/deng-logo-512.png" }
+    }
 
     group game {
         image libdoom    { path = "graphics/game-libdoom.png" }
@@ -33,6 +41,10 @@ image updater  { path = "graphics/updater.png" }
 
 group toggle {
     image onoff { path = "graphics/toggle-onoff.png" }
+    group {    
+        condition: DisplayMode.DPI_FACTOR == 2
+        image onoff { path = "graphics/toggle-onoff@2x.png"}
+    }
 }
 
 group progress {

doomsday/client/data/defaultstyle.pack/rules.dei → doomsday/client/net.dengine.client.pack/defaultstyle.pack/rules.dei

@@ -1,7 +1,8 @@
 # Length rules for the default UI style
 
 script {
-    UNIT = 4.0
+    import DisplayMode
+    UNIT = 4.0 * DisplayMode.DPI_FACTOR
 }
 
 rule unit     { constant $= UNIT }

doomsday/client/modules/appconfig.de → doomsday/client/net.dengine.client.pack/modules/appconfig.de

@@ -37,41 +37,43 @@ def setDefaults(d)
     # Additional Log defaults.
     d.log.filterBySubsystem = False
     d.log.showMetadata = False
-    record d.alert
-    d.alert.generic  = Log.WARNING
-    d.alert.resource = Log.WARNING
-    d.alert.map      = Log.WARNING
-    d.alert.script   = Log.WARNING
-    d.alert.gl       = Log.WARNING
-    d.alert.audio    = Log.WARNING
-    d.alert.input    = Log.WARNING
-    d.alert.network  = Log.WARNING
+    record d.alert()
+        generic  = Log.WARNING
+        resource = Log.WARNING
+        map      = Log.WARNING
+        script   = Log.WARNING
+        gl       = Log.WARNING
+        audio    = Log.WARNING
+        input    = Log.WARNING
+        network  = Log.WARNING
+    end
 
     # Input defaults.
     record d.input
     record d.input.mouse
     d.input.mouse.syncSensitivity = True
 
     # Defaults for the automatic updater.
-    record d.updater
-
-    d.updater.frequency = Updater.WEEKLY
-    if Version.STABLE
-        d.updater.channel = Updater.CHANNEL_STABLE
-    else
-        d.updater.channel = Updater.CHANNEL_UNSTABLE
+    record d.updater()
+        frequency = Updater.WEEKLY
+        if Version.STABLE
+            channel = Updater.CHANNEL_STABLE
+        else
+            channel = Updater.CHANNEL_UNSTABLE
+        end
+        lastChecked = Time("")
+        onlyManually = (Version.OS == 'unix')
+        autoDownload = False
+        delete = True
+        downloadPath = "${DEFAULT}"
+        deleteAtStartup = ""
     end
-    d.updater.lastChecked = Time("")
-    d.updater.onlyManually = (Version.OS == 'unix')
-    d.updater.autoDownload = False
-    d.updater.delete = True
-    d.updater.downloadPath = "${DEFAULT}"
-    d.updater.deleteAtStartup = ""
 
     # Console defaults.
-    record d.console
-    d.console.snap = True
-    d.console.script = False
+    record d.console()
+        snap = True
+        script = False
+    end
 
     # Master server settings.
     record d.masterServer