Commit 474df40b authored by janssontoftg's avatar janssontoftg
Browse files

Merge remote-tracking branch 'remotes/origin/main' into ericsson/tt-ci-tix

parents bcbc86f3 c2e4d1de

scripts/makefile_SR.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
--- Makefile	2023-08-15 09:31:05.336005000 +0200

+++ Makefile_patched2	2023-08-15 09:40:48.407929000 +0200

@@ -134,12 +134,7 @@

 SRCS_LIBENC   = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBREND  = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBUTIL  = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-ifeq "$(INCLUDE_SPLIT)" "1"

 SRCS_LC3PLUS  = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-else

-SRCS_LIBREND := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBREND))

-SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))

-endif

 

 OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

 OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))

scripts/makefile_noSR.patch

+11 −7
Original line number Diff line number Diff line 
--- Makefile	2023-08-11 21:40:55.974878000 +0200

+++ Makefile_patched	2023-08-11 21:43:18.230151000 +0200

--- Makefile	2023-08-15 09:31:05.336005000 +0200

+++ Makefile_patched	2023-08-15 09:49:15.722019000 +0200

@@ -6,13 +6,12 @@

 SRC_LIBDEC   = lib_dec

 SRC_LIBENC   = lib_enc
@@ -23,15 +23,19 @@ 
 LIB_LIBUTIL  ?= libivasutil.a

 

 # Default tool settings

@@ -124,7 +122,6 @@

 SRCS_LIBDEC   = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

@@ -134,26 +132,21 @@

 SRCS_LIBENC   = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBREND  = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-SRCS_LC3PLUS  = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBUTIL  = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-ifeq "$(INCLUDE_SPLIT)" "1"

-SRCS_LC3PLUS  = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-else

 SRCS_LIBREND := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBREND))

 SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))

-endif

 

 OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

@@ -132,14 +129,13 @@

 OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))

 OBJS_LIBDEC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))

 OBJS_LIBENC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBENC:.c=.o))

 OBJS_LIBREND     = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o))
@@ -47,7 +51,7 @@ 
 

 ###############################################################################

 

@@ -165,28 +161,25 @@

@@ -179,28 +172,25 @@

 $(LIB_LIBREND): $(OBJS_LIBREND)

 	$(QUIET_AR)$(AR) rcs $@ $^

scripts/prepare_delivery.sh

+9 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ recode lat1..ibmpc ${OUTDIR}/LICENSE.md # unix2dos ... 
# include .clang_format, since this is a VS dependency

cp ${ROOT}/.clang-format ${OUTDIR}



# enable split rendering againg by default

# in case we strip it later, it will be explicitly disabled again belo

sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h



##########################

#                        #

# Strip Split Rendering  #
@@ -238,6 +242,11 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
  # clean-up *.bak-files

  find $OUTDIR -name "*.bak" -exec rm \{\} \;



else



  # patch Makefile so that split rendering sources are built by default

  patch ${OUTDIR}/Makefile < ${ROOT}/scripts/makefile_SR.patch  



fi