Attachment #423222 for bug #567230




++ libraries/source/fcollada/src/Makefile


CXX ?= g++
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
CXXFLAGS_TEST := -D_DEBUG
LIBS += `pkg-config libxml-2.0 --libs`
INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
++ build/premake/premake4/src/tools/gcc.lua

		if not cfg.flags.Symbols then
			if cfg.system == "macosx" then
				table.insert(result, "-Wl,-x")
			else
				table.insert(result, "-s")
			end
		end
	
++ build/premake/premake4/build/gmake.unix/Premake4.make

  DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
  INCLUDES  += -I../../src/host/lua-5.1.4/src
  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
  CFLAGS    += $(CPPFLAGS) -Wall
  CXXFLAGS  += $(CPPFLAGS) -Wall
  LDFLAGS   += -rdynamic
  LIBS      += -lm -ldl 
  RESFLAGS  += $(DEFINES) $(INCLUDES) 
  LDDEPS    += 

  DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
  INCLUDES  += -I../../src/host/lua-5.1.4/src
  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
  CFLAGS    += $(CPPFLAGS) -Wall
  CXXFLAGS  += $(CPPFLAGS) -Wall
  LDFLAGS   += -rdynamic
  LIBS      += -lm -ldl 
  RESFLAGS  += $(DEFINES) $(INCLUDES) 

	$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"

-include $(OBJECTS:%.o=%.d)
-include $(GCH:%.h.gch=%.h.d)
++ libraries/source/spidermonkey/build.sh

cd mozjs31/js/src

# Clean up data generated by previous builds that could cause problems
rm -rf build-debug
rm -rf build-release

# We want separate debug/release versions of the library, so we have to change
# the LIBRARY_NAME for each build.
# (We use perl instead of sed so that it works with MozillaBuild on Windows,
# which has an ancient sed.)
perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build
mkdir -p build-debug
cd build-debug
CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis
${MAKE} ${MAKE_OPTS}
cd ..

perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build
mkdir -p build-release

mkdir -p ${INCLUDE_DIR_DEBUG}
mkdir -p ${INCLUDE_DIR_RELEASE}
cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/

mkdir -p lib/
cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX}
cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}
cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX}
cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}

# Flag that it's already been built successfully so we can skip it next time

Return to bug 567230

Line Link Here

(-)file_not_specified_in_diff (-30 / +13 lines)
0	-- libraries/source/fcollada/src/Makefile	0	++ libraries/source/fcollada/src/Makefile
Lines 9-17 Link Here
9		9
10	CXX ?= g++	10	CXX ?= g++
11	CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)	11	CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
12	CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL	12	CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
13	CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL	13	CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
14	CXXFLAGS_TEST := -O0 -g -D_DEBUG	14	CXXFLAGS_TEST := -D_DEBUG
15	LIBS += `pkg-config libxml-2.0 --libs`	15	LIBS += `pkg-config libxml-2.0 --libs`
16	INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`	16	INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
17	INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)	17	INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
18	-- build/premake/premake4/src/tools/gcc.lua	18	++ build/premake/premake4/src/tools/gcc.lua
Lines 136-143 Link Here
136	if not cfg.flags.Symbols then	136	if not cfg.flags.Symbols then
137	if cfg.system == "macosx" then	137	if cfg.system == "macosx" then
138	table.insert(result, "-Wl,-x")	138	table.insert(result, "-Wl,-x")
139	else
140	table.insert(result, "-s")
141	end	139	end
142	end	140	end
143		141
144	-- build/premake/premake4/build/gmake.unix/Premake4.make	142	++ build/premake/premake4/build/gmake.unix/Premake4.make
Lines 26-34 Link Here
26	DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN	26	DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
27	INCLUDES += -I../../src/host/lua-5.1.4/src	27	INCLUDES += -I../../src/host/lua-5.1.4/src
28	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)	28	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
29	CFLAGS += $(CPPFLAGS) -Wall -Os	29	CFLAGS += $(CPPFLAGS) -Wall
30	CXXFLAGS += $(CPPFLAGS) -Wall -Os	30	CXXFLAGS += $(CPPFLAGS) -Wall
31	LDFLAGS += -s -rdynamic	31	LDFLAGS += -rdynamic
32	LIBS += -lm -ldl	32	LIBS += -lm -ldl
33	RESFLAGS += $(DEFINES) $(INCLUDES)	33	RESFLAGS += $(DEFINES) $(INCLUDES)
34	LDDEPS +=	34	LDDEPS +=
Lines 48-55 Link Here
48	DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN	48	DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
49	INCLUDES += -I../../src/host/lua-5.1.4/src	49	INCLUDES += -I../../src/host/lua-5.1.4/src
50	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)	50	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
51	CFLAGS += $(CPPFLAGS) -Wall -g	51	CFLAGS += $(CPPFLAGS) -Wall
52	CXXFLAGS += $(CPPFLAGS) -Wall -g	52	CXXFLAGS += $(CPPFLAGS) -Wall
53	LDFLAGS += -rdynamic	53	LDFLAGS += -rdynamic
54	LIBS += -lm -ldl	54	LIBS += -lm -ldl
55	RESFLAGS += $(DEFINES) $(INCLUDES)	55	RESFLAGS += $(DEFINES) $(INCLUDES)
Lines 302-305 Link Here
302	$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"	302	$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
303		303
304	-include $(OBJECTS:%.o=%.d)	304	-include $(OBJECTS:%.o=%.d)
305	-include $(GCH:%.h.gch=%.h.d)	305	-include $(GCH:%.h.gch=%.h.d)
306	-- libraries/source/spidermonkey/build.sh	306	++ libraries/source/spidermonkey/build.sh
Lines 92-110 Link Here
92	cd mozjs31/js/src	92	cd mozjs31/js/src
93		93
94	# Clean up data generated by previous builds that could cause problems	94	# Clean up data generated by previous builds that could cause problems
95	rm -rf build-debug
96	rm -rf build-release	95	rm -rf build-release
97
98	# We want separate debug/release versions of the library, so we have to change
99	# the LIBRARY_NAME for each build.
100	# (We use perl instead of sed so that it works with MozillaBuild on Windows,
101	# which has an ancient sed.)
102	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build
103	mkdir -p build-debug
104	cd build-debug
105	CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis
106	${MAKE} ${MAKE_OPTS}
107	cd ..
108		96
109	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build	97	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build
110	mkdir -p build-release	98	mkdir -p build-release
Lines 147-158 Link Here
147	mkdir -p ${INCLUDE_DIR_DEBUG}	135	mkdir -p ${INCLUDE_DIR_DEBUG}
148	mkdir -p ${INCLUDE_DIR_RELEASE}	136	mkdir -p ${INCLUDE_DIR_RELEASE}
149	cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/	137	cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
150	cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
151		138
152	mkdir -p lib/	139	mkdir -p lib/
153	cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX}
154	cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}	140	cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}
155	cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX}
156	cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}	141	cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}
157		142
158	# Flag that it's already been built successfully so we can skip it next time	143	# Flag that it's already been built successfully so we can skip it next time