[Libreoffice-commits] .: 4 commits - .gitignore solenv/inc

[Tor Lillqvist]

 .gitignore                       |    2 ++
 solenv/inc/startup/OS2/macros.mk |   30 ------------------------------
 solenv/inc/version.lst           |    8 ++++----
 3 files changed, 6 insertions(+), 34 deletions(-)

New commits:
commit 7c7d6ff8fa9eaab1d1520dfc25b86887e66ab311
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 21 12:59:58 2011 +0300

    Ignore the MSVC vc90.pdb files

diff --git a/.gitignore b/.gitignore
index eb430e5..f42c00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,5 @@
 /solenv/gdb/libreoffice/*.py[co]
 /solenv/gdb/libreoffice/util/*.py[co]
 
+# MSVC debug information
+/*/vc90.pdb
commit f502005eb85b3c4931e4b1731af9c4617fe7d923
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 21 12:57:24 2011 +0300

    Bin OS/2 stuff

diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk
deleted file mode 100644
index 2f1447e..0000000
--- a/solenv/inc/startup/OS2/macros.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Define additional OS/2 specific macros.
-#
-
-# Process release-specific refinements, if any.
-# YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Directory entries are case incensitive
-.DIRCACHERESPCASE *:= no
-
-# tmp is already imported - use it!
-TMPDIR *= $(TMP)
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-.MKSARGS         *:= yes
-RM               *=  $(ROOTDIR)$/bin$/rm
-MV	            *=  $(ROOTDIR)$/bin$/mv
-DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
-__.DIVSEP-sh-yes !:= \\\
-__.DIVSEP-sh-no  !:= \\
-
-NAMEMAX		=	256
-
commit 81bb70b6b9635a95a6fb0e83651f6bf708f12942
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 21 12:56:28 2011 +0300

    chmod -x

diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
old mode 100755
new mode 100644
diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk
old mode 100755
new mode 100644
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
old mode 100755
new mode 100644
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
old mode 100755
new mode 100644
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
old mode 100755
new mode 100644
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
old mode 100755
new mode 100644
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
old mode 100755
new mode 100644
commit 164456eab5c8542b9ce87c5ccd44db902c1214a1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 21 12:49:33 2011 +0300

    Update to match reality
    
    But actually, I would really love it if we could get rid of this
    version.lst file. Surely we can put this information, if it has to be
    hardcoded somewhere, in the same minor.mk that already contains
    version information (and which, unlike this file, actually has been
    kept updated by us).
    
    Or alternatively, get rid of minor.mk and use just this file.
    
    Best of all would be to just use the version number from the AC_INIT
    in configure.in, wouldn't it? Isn't that the normal thing to do?
    
    Also, I don't see what hardoced version timestamps as in this file are
    useful for. If such a timestamp corresponds one-to-one with a version
    number, the information clearly is redundant? A *build* timestamp is
    another thing, that might be more useful if file timestamps or package
    timestamps don't give enough information.

diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index 200cdf5..aed0b5a 100755
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -26,9 +26,9 @@
 #*************************************************************************
 
 OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=4
+OOOBASEVERSIONMINOR=5
 OOOBASEVERSIONMICRO=0
 
-OOOBASEVERSIONDAY=1
-OOOBASEVERSIONMONTH=10
-OOOBASEVERSIONYEAR=2010
+OOOBASEVERSIONDAY=21
+OOOBASEVERSIONMONTH=9
+OOOBASEVERSIONYEAR=2011