Skip to content

Commit b10f57e

Browse files
committed
Add: make bananas (closes #6877, #6848)
1 parent fc957d2 commit b10f57e

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

.hgignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ opengfx-*
3131

3232
# Ignore frequent development left-overs like
3333
# editor backups, patches, rejects etc. pp
34-
opengfx-*.tar
34+
opengfx*.tar
35+
opengfx*.bananas.ini
3536
*.orig
3637
*.bak
3738
*.log

Makefile

+12-2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ MAIN_SRC_FILES ?= $(addsuffix .pnml,$(BASE_FILENAME))
6161
# Add any additional, not usual files here, too, including
6262
# their relative path to the root of the repository
6363
BUNDLE_FILES ?= $(GRF_FILES) $(DOC_FILES)
64+
BANANAS_INI ?= bananas.ini
6465

6566
# Replacement strings in the source and in the documentation
6667
# You may only change the values, not add new definitions
@@ -84,7 +85,7 @@ all: $(GRF_FILES) $(GENERATE_DOC) bundle_tar
8485

8586
# general definitions (no rules!)
8687
-include Makefile.dist
87-
.PHONY: all clean distclean doc bundle bundle_bsrc bundle_bzip bundle_gsrc bundle_src bundle_tar bundle_xsrc bundle_xz bundle_zip bundle_zsrc check
88+
.PHONY: all clean distclean doc bananas bundle bundle_bsrc bundle_bzip bundle_gsrc bundle_src bundle_tar bundle_xsrc bundle_xz bundle_zip bundle_zsrc check
8889

8990
# We want to disable the default rules. It's not c/c++ anyway
9091
.SUFFIXES:
@@ -123,6 +124,8 @@ HG ?= hg
123124

124125
PYTHON ?= python
125126

127+
MUSA ?= musa.py
128+
126129
UNIX2DOS ?= unix2dos
127130
UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
128131

@@ -426,6 +429,11 @@ bundle_xz: $(DIR_NAME).tar.xz
426429
$(_E) "[BUNDLE XZ] $@"
427430
$(_V) $(XZ) $(XZ_FLAGS) $^
428431

432+
bananas: $(DIR_NAME)
433+
$(_E) "[BaNaNaS]"
434+
$(_V) sed 's/^version *=.*/version = $(FILE_VERSION_STRING)/' $(BANANAS_INI) > $(DIR_NAME).bananas.ini
435+
$(_V) $(MUSA) -r -x license.txt -c $(DIR_NAME).bananas.ini $(DIR_NAME)
436+
429437
clean::
430438
$(_E) "[CLEAN BUNDLE]"
431439
$(_V) -rm -rf $(DIR_NAME)
@@ -591,7 +599,6 @@ endif
591599
$(_E) " Reset the repository to prestine state and delete files which can be generated"
592600
$(_E)
593601
$(_E) "Bundles for distribution:"
594-
$(_E) "bundle: Build the distribution bundle in $(DIR_NAME)"
595602
$(_E) "bundle_tar: Build the distritubion bundle as tar archive ($(DIR_NAME).tar)"
596603
$(_E) "bundle_zip: Build the distritubion bundle and compress with zip ($(DIR_NAME).tar.zip)"
597604
$(_E) "bundle_xz: Build the distritubion bundle and compress with xz ($(DIR_NAME).tar.xz)"
@@ -603,6 +610,9 @@ endif
603610
$(_E) "bundle_xsrc: Build the source bundle as tar archive compressed with xz"
604611
$(_E) "bundle_zsrc: Build the source bundle as tar archive compressed with zip"
605612
$(_E)
613+
$(_E) "Release:"
614+
$(_E) "bananas: Upload bundle to BaNaNaS
615+
$(_E)
606616
$(_E) "Valid command line variables are:"
607617
$(_E) "Helper programmes:"
608618
$(_E) "MAKE MAKE_FLAGS. defaults: $(MAKE) $(MAKE_FLAGS)"

bananas.ini

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[musa]
2+
type = Base Graphic
3+
name = OpenGFX
4+
5+
# The version is inserted by the Makefile
6+
version =
7+
8+
description_file = bananas_description.txt
9+
url = http://dev.openttdcoop.org/projects/opengfx
10+
license = GPL v2
11+
tags = opengfx, 8bpp, base graphics
12+
openttd_minimum_supported_version = 1.2.0
13+
openttd_maximum_supported_version =
14+
dependencies=
15+
16+
authors = openttdcoop

bananas_description.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The OpenGFX Graphics Base Set is the free base graphics for OpenTTD.
2+
You can switch base graphics sets via the Game Options dialog in the main menu.
3+
OpenGFX is licensed under the GNU General Pubilc License version 2.0.

0 commit comments

Comments
 (0)