Changeset 405 for branches/highdpi/Install

Timestamp:

Nov 3, 2021, 11:22:02 AM (4 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r404.

Location:

branches/highdpi/Install

Files:

• deb/debian/changelog (modified) (1 diff)
• deb/debian/control (modified) (1 diff)
• rpm/c-evo.spec (modified) (2 diffs)
• snap/local/build.sh (modified) (1 diff)
• snap/local/c-evo (deleted)
• snap/local/command-c-evo-gtk.wrapper (deleted)
• snap/local/desktop-launch (deleted)
• snap/snapcraft.yaml (modified) (6 diffs)
• win/C-evo.iss (modified) (1 diff)

branches/highdpi/Install/deb/debian/changelog

@@ -1 @@
-c-evo (1.3.0-0) precise; urgency=low
+c-evo (1.4.0-0) precise; urgency=low
 
-  * Original version 1.3.0 packaged with lazdebian
+  * Original version 1.4.0 packaged with lazdebian
 
  -- Chronos <robie@centrum.cz>  Sun, 17 Dec 2016 00:51:08 +0100

branches/highdpi/Install/deb/debian/control

@@ -3 +3 @@
 Section: games
 Priority: optional
-Standards-Version: 1.3.0
+Standards-Version: 1.4.0
 Build-Depends: fpc, lazarus, lcl, lcl-utils, debhelper (>= 8)
 

branches/highdpi/Install/rpm/c-evo.spec

@@ -1 +1 @@
 Name:           c-evo
-Version:        1.3.0
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Empire building game
@@ -55 +55 @@
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/c-evo/Saved
 install -D -m 644 Saved/* $RPM_BUILD_ROOT/usr/share/c-evo/Saved
-#install -d -m 755 $RPM_BUILD_ROOT/usr/share/c-evo/AI\ Template
-#install -D -m 644 AI\ Template/* $RPM_BUILD_ROOT/usr/share/c-evo/AI\ Template
+install -d -m 755 $RPM_BUILD_ROOT/usr/share/c-evo/AI\ Template
+cp -R AI\ Template $RPM_BUILD_ROOT/usr/share/c-evo
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/c-evo/Localization
 cp -R Localization $RPM_BUILD_ROOT/usr/share/c-evo

branches/highdpi/Install/snap/local/build.sh

@@ -4 +4 @@
 
 pushd ../../..
-snapcraft --debug
+snapcraft --debug --use-lxd
 popd
 

branches/highdpi/Install/snap/snapcraft.yaml

@@ -1 +1 @@
 name: c-evo
 title: "C-evo: New Horizons"
-version: '1.3.0'
+version: '1.4.0'
 summary: A turn-based empire building game inspired by Civilization II game.
 description: |
-  This is a fork and Lazarus port of the original game which can be 
-  found at ​www.c-evo.org.
-confinement: devmode
+  This is a fork and Lazarus/FPC port of the original C-evo 1.2.0 game.
+  Now it is finally possible to play C-evo natively on Linux.  
+  * Zoomable map by mouse wheel with three tile sizes
+  * Many sample maps included
+  * All available localizations include
+  * Many other small improvements
+confinement: strict
 base: core20
-#base: core18
-grade: devel
+grade: stable
 icon: Graphics/c-evo_64x64.png
+license: NLPL
 
+environment:
+  LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
+  PULSE_SERVER: unix:/run/user/1000/pulse/native
+
+layout:
+  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/sox:
+    bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/sox   
+  
 parts:
   c-evo:
@@ -23 +35 @@
     - lcl-utils
     stage-packages:    
+    - sox
+    - libsox-fmt-mp3
+    - libsox-fmt-pulse
+    - libpulse0 
+    # Autodetected dependencies
     - libatk1.0-0
     - libcairo2
@@ -53 +70 @@
     - libxrandr2
     - libxrender1
-    #- sox
-    #- libsox-fmt-mp3
     override-build: |
+      snapcraftctl build
       (cd AI/StdAI &&lazbuild --build-mode=Release StdAI.lpi)
       mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
@@ -62 +78 @@
       install -d -m 755 $ROOT/usr/share/c-evo
       install -s -m 755 c-evo $ROOT/usr/share/c-evo
-      install -m 755 Install/snap/local/command-c-evo-gtk.wrapper $ROOT/usr/share/c-evo     
       install -m 644 Language.txt $ROOT/usr/share/c-evo
       install -m 644 Language2.txt $ROOT/usr/share/c-evo
       install -m 644 Fonts.txt $ROOT/usr/share/c-evo
-      #install -d -m 755 $ROOT/bin
-      #install -m 755 Install/snap/local/desktop-launch $ROOT/bin
-      #install -m 755 Install/snap/local/c-evo $ROOT/bin/c-evo
-      #install -d -m 755 $ROOT/usr/bin      
       install -d -m 755 $ROOT/usr/share/applications
       install -m 755 Install/deb/c-evo.desktop $ROOT/usr/share/applications
@@ -91 +102 @@
       cp -r "AI Template" $ROOT/usr/share/c-evo
     stage:
-      - bin
-      - lib
       - etc
       - usr
@@ -101 +110 @@
 apps:
   c-evo:
-    #command: desktop-launch $SNAP/c-evo-snap
     command: usr/share/c-evo/c-evo
-    #command: usr/share/c-evo/command-c-evo-gtk.wrapper
     desktop: usr/share/applications/c-evo.desktop    
-    #extensions: [gnome-3-28]
     plugs:
-      - home      
-      - pulseaudio
+      - home
+      - audio-playback
       - desktop
-      - desktop-legacy
       - x11
-  

branches/highdpi/Install/win/C-evo.iss

@@ -24 +24 @@
 
 [Files]
-Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: not Is64BitInstallMode
-Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\StdAI\lib\x86_64-win64-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Components: ai\stdai; Check: Is64BitInstallMode
 Source: "{#MyAppSubDir}\AI\StdAI\lib\i386-win32-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win32.dll"; Flags: ignoreversion; Components: ai\stdai; Check: not Is64BitInstallMode
-Source: "{#MyAppSubDir}\AI\StdAI\lib\x86_64-win64-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Components: ai\stdai; Check: Is64BitInstallMode
 Source: "{#MyAppSubDir}\AI\AI_UO\*.*"; DestDir: "{app}\AI\AI_UO"; Flags: ignoreversion; Components: ai\ai_uo; Check: not Is64BitInstallMode
 Source: "{#MyAppSubDir}\AI\AIAS\*.*"; DestDir: "{app}\AI\AIAS"; Flags: ignoreversion; Components: ai\aias; Check: not Is64BitInstallMode