merged OOO330 m2

7 files changed, 82 insertions, 11 deletions

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 42eb91b48474..ef764a7ee545 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=300
-RSCREVISION=300m84(Build:9512)
-BUILD=9512
-LAST_MINOR=m84
-SOURCEVERSION=DEV300
+RSCVERSION=330
+RSCREVISION=330m2(Build:9516)
+BUILD=9516
+LAST_MINOR=m2
+SOURCEVERSION=OOO330
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index cfd4d89bb3bc..68bbc797d8af 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -827,6 +827,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)
 .IF  "$(LOCALIZESDF)"==""
 LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
 LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.IF  "$(LOCALIZESDF)"==""
+LOCALSDFFILE!:=
+.ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(LOCALIZESDF)"==""
 # dummy target to keep the build happy.
 .IF  "$(LOCALIZESDF)"==""
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index be8c5d01b714..aff552dde89c 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -198,6 +198,14 @@ STDLIBCUIMT+=-ltcmalloc
 STDSHLGUIMT+=-ltcmalloc
 STDSHLCUIMT+=-ltcmalloc
 .ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 LINKFLAGS += -Wl,--hash-style=both
 .ELSE
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index d4c205f942b9..9c2b9be4189a 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         3
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
new file mode 100644
index 000000000000..ac49f6c6fcf6
--- /dev/null
+++ b/solenv/inc/version.lst
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+OOOBASEVERSIONMAJOR=3
+OOOBASEVERSIONMINOR=3
+OOOBASEVERSIONMICRO=0
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 70ea1c193ee6..9773f10fdddf 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         9
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
new file mode 100644
index 000000000000..31a255e48be1
--- /dev/null
+++ b/solenv/inc/versionlist.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.INCLUDE: version.lst
+
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO