Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Release Note: build win32 tools on Linux wip
authoryiluzhu
Tue, 26 Jan 2010 14:25:54 +0000
branchwip
changeset 319 17156855fe69
parent 318 d23e846951c5
child 320 49da1e705345
child 321 abc1aa76870f
Release Note: build win32 tools on Linux
sbsv2/raptor/RELEASE-NOTES.txt file | annotate | diff | comparison | revisions
sbsv2/raptor/lib/config/variants.xml file | annotate | diff | comparison | revisions
sbsv2/raptor/lib/flm/tools2common.flm file | annotate | diff | comparison | revisions
sbsv2/raptor/lib/flm/tools2exe.flm file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 26 14:20:07 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 26 14:25:54 2010 +0000
@@ -1,6 +1,14 @@
 
 Release Notes for Symbian Build System v2
 
+next version
+
+- New build win32 tools on Linux.  
+  To enable it, use variant '.win32'. To build both windows and linux binaries,
+  use:
+	-c tools2.win32 -c tools2
+  It only applies to platform tools2 on Linux
+
 version 2.12.0
 
 New Features:
--- a/sbsv2/raptor/lib/config/variants.xml	Tue Jan 26 14:20:07 2010 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml	Tue Jan 26 14:25:54 2010 +0000
@@ -9,10 +9,10 @@
 	<!-- This variant enables building win32 tools in Linux. Tools2 only -->
 	<var name="win32">
 		<set name='TOOLS2WIN32' value='1'/>
-		<env name='MINGW_LINUX_PREFIX' default='i586-mingw32msvc'/>
-		<env name='GCC' default='$(MINGW_LINUX_PREFIX)-g++' type='tool'/>
-		<env name='ARCHIVER' default='$(MINGW_LINUX_PREFIX)-ar' type='tool'/>
-		<env name='RANLIB' default='$(MINGW_LINUX_PREFIX)-ranlib' type='tool'/>
+		<env name='SBS_MINGW_LINUX_PREFIX' default='i586-mingw32msvc'/>
+		<env name='GCC' default='$(SBS_MINGW_LINUX_PREFIX)-g++' type='tool'/>
+		<env name='ARCHIVER' default='$(SBS_MINGW_LINUX_PREFIX)-ar' type='tool'/>
+		<env name='RANLIB' default='$(SBS_MINGW_LINUX_PREFIX)-ranlib' type='tool'/>
 		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2/$(VARIANTTYPE)'/>
 		<set name='DOTEXE' value='.exe'/>
 	</var>
--- a/sbsv2/raptor/lib/flm/tools2common.flm	Tue Jan 26 14:20:07 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tools2common.flm	Tue Jan 26 14:25:54 2010 +0000
@@ -18,7 +18,7 @@
 
 ## Input parameters
 
-ifeq ($(OSTYPE),cygwin)
+ifeq ($(filter win,$(HOSTPLATFORM)),win)
 CDEFS.TOOLS2:=$(CDEFS.WIN32) $(CDEFS)
 CFLAGS:=$(CFLAGS.WIN32) $(CFLAGS) $(OPTION_GCC)
 COMPILER_PATH:=$(COMPILER_PATH.WIN32)
--- a/sbsv2/raptor/lib/flm/tools2exe.flm	Tue Jan 26 14:20:07 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tools2exe.flm	Tue Jan 26 14:25:54 2010 +0000
@@ -16,7 +16,7 @@
 #
 
 ## Outputs - externally relevant targets that this FLM generates
-ifeq ($(OSTYPE),cygwin)
+ifeq ($(filter win,$(HOSTPLATFORM)),win)
 SYSTEMLIBS:=$(LIBS.WIN32)
 else
 ifneq ($(TOOLS2WIN32),)
FCL/sftools/dev/build