CWS-TOOLING: integrate CWS kso45

This commit is contained in:
Jens-Heiner Rechtien
2010-07-22 13:45:03 +02:00
2 changed files with 13 additions and 15 deletions

View File

@@ -33,11 +33,9 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.INCLUDE: rtlbootstrap.mk .INCLUDE: rtlbootstrap.mk
.INCLUDE: versionlist.mk
#TODO: The underlying OOo base version needed here is currently only available my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR)
# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here
# for now (see issue 110653):
my_version = 3.3
DLLPRE = DLLPRE =

View File

@@ -1,7 +1,7 @@
/************************************************************************* /*************************************************************************
* *
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright 2000, 2010 Oracle and/or its affiliates. * Copyright 2000, 2010 Oracle and/or its affiliates.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
@@ -25,26 +25,26 @@
* *
*************************************************************************/ *************************************************************************/
#define VERSION 3 #define VERSION 3
#define SUBVERSION 2 #define SUBVERSION 3
//#define VERVARIANT 0 //#define VERVARIANT 0
// .0 + VER_CONCEPT // .0 + VER_CONCEPT
// .100 + VER_ALPHA // .100 + VER_ALPHA
// .200 + VER_BETA // .200 + VER_BETA
// .300 + VER_GAMMA // .300 + VER_GAMMA
// .500 + VER_FINAL // .500 + VER_FINAL
//#define VER_CONCEPT 0 //#define VER_CONCEPT 0
//#define VER_BETA 6 //#define VER_BETA 6
#define VER_FINAL 0 #define VER_FINAL 0
#define VER_DAY 1 #define VER_DAY 1
#define VER_MONTH 9 #define VER_MONTH 1
#define VER_YEAR 2009 #define VER_YEAR 2010
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// language/character set specification table // language/character set specification table
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------