GitLab has been upgraded to 13.7.4 If you encounter any issues mail code@riscosopen.org

Commit 04c2214d authored by Ben Avison's avatar Ben Avison Committed by ROOL

Fix install location

Binaries were being placed in objs/PlingBuilder/!Builder, when we wanted them
in PlingBuilder. Deploy was correctly identifying no changes in PlingBuilder
and hence not doing a merge request. Also fix Makefile so Messages is also in
INSTAPP_FILES as per instructions in CApp (required to correctly insert
version string in cross-compile case).

Version 0.30. Tagged as 'builder-0_30'
parent 8ed23d4a
......@@ -18,7 +18,9 @@ deploy:
- unzip -q RiscOS.zip
- shopt -s expand_aliases && source RiscOS/Env/ROOL/BuildHost.sh
- git clone https://gitbot:$PASSWORD@gitlab.riscosopen.org/gitbot/PlingBuilder
- COMPONENT=Builder TARGET=Builder INSTDIR=PlingBuilder make -k install
- make links
- ln -s ../PlingBuilder objs/!Builder
- COMPONENT=Builder TARGET=Builder INSTDIR=. make install
# If the installed binary has changed in any way, then...
# - if major version number is unchanged, then do an untagged merge request
# (most likely this means there have been toolchain and/or library
......
......@@ -21,7 +21,7 @@ INSTTYPE = app
OBJS = main msg env file parse build
CDFLAGS = -DDEBUGLIB
LIBS = ${TBOXLIBS}
INSTAPP_FILES = !Boot !build !Help !Run !Sprites Res !RunImage
INSTAPP_FILES = !Boot !build !Help Messages !Run !Sprites Res !RunImage
INSTAPP_VERSION = Messages
include CApp
......
/* (0.29)
/* (0.30)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.29
#define Module_MajorVersion_CMHG 0.30
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Apr 2020
#define Module_MajorVersion "0.29"
#define Module_Version 29
#define Module_MajorVersion "0.30"
#define Module_Version 30
#define Module_MinorVersion ""
#define Module_Date "07 Apr 2020"
......@@ -16,6 +16,6 @@
#define Module_ComponentName "builder"
#define Module_FullVersion "0.29"
#define Module_HelpVersion "0.29 (07 Apr 2020)"
#define Module_LibraryVersionInfo "0:29"
#define Module_FullVersion "0.30"
#define Module_HelpVersion "0.30 (07 Apr 2020)"
#define Module_LibraryVersionInfo "0:30"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment