diff options
| -rw-r--r-- | solenv/inc/settings.mk | 19 | ||||
| -rwxr-xr-x | solenv/inc/version.hrc | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | solenv/inc/version.lst | 4 | ||||
| -rwxr-xr-x | solenv/inc/version_so.hrc | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | solenv/inc/versionlist.mk | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | solenv/makefile.mk | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | solenv/prj/d.lst | 6 |
7 files changed, 34 insertions, 42 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 01e412ec5381..a4b02a9ed164 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -299,6 +299,12 @@ dbgutil= # --------------------------------------------------------------------------- DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD)) +.IF "$(GUI)"=="WNT" +posix_PWD:=/cygdrive/$(PWD:s/://) +.ELSE #GUI)"=="WNT" +posix_PWD:=$(PWD) +.ENDIF #GUI)"=="WNT" + .IF "$(TMP)"!="" tmp*=$(TMP) @@ -604,23 +610,18 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # As this is not part of the initial startup makefile we define an infered # target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) -$(OUT)/inc/%world.mk : +$(posix_PWD)/$(OUT)/inc/%world.mk : @$(MKOUT) $(ROUT) @echo $(EMQ)# > $@ -# don't need/want output trees in solenv!!! -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(OUT)/inc/myworld.mk .IF "$(common_build)"!="" -$(LOCAL_COMMON_OUT)/inc/%world.mk : +$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk : @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT)) @echo $(EMQ)# > $@ -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(common_build)"!="" .INCLUDE .IGNORE : office.mk diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index 426e55437e1b..0a0d0d103ac3 100755 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -25,21 +25,11 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 4 +#include "versionlist.hrc" + //#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_BETA 6 -#define VER_FINAL 0 -#define VER_DAY 1 -#define VER_MONTH 8 -#define VER_YEAR 2010 +#define VER_FINAL 0 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst index 5dd3a2a37fad..200cdf53e924 100644..100755 --- a/solenv/inc/version.lst +++ b/solenv/inc/version.lst @@ -28,3 +28,7 @@ OOOBASEVERSIONMAJOR=3 OOOBASEVERSIONMINOR=4 OOOBASEVERSIONMICRO=0 + +OOOBASEVERSIONDAY=1 +OOOBASEVERSIONMONTH=10 +OOOBASEVERSIONYEAR=2010 diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 5493a1587b7c..383f3530ccbf 100755 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -25,21 +25,11 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 4 +#include "versionlist.hrc" + //#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_BETA 6 -#define VER_FINAL 0 -#define VER_DAY 1 -#define VER_MONTH 8 -#define VER_YEAR 2010 +#define VER_FINAL 0 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk index 31a255e48be1..672df7bd7602 100644..100755 --- a/solenv/inc/versionlist.mk +++ b/solenv/inc/versionlist.mk @@ -27,4 +27,4 @@ .INCLUDE: version.lst -.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO +.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR diff --git a/solenv/makefile.mk b/solenv/makefile.mk index 31bed765ac7f..c4a2d0893d7c 100644..100755 --- a/solenv/makefile.mk +++ b/solenv/makefile.mk @@ -32,9 +32,14 @@ TARGET=init # --- Settings ---------------------------------- .INCLUDE : settings.mk .INCLUDE : target.mk +.INCLUDE : versionlist.mk -ALLTAR : comment - -comment: - @echo just for sideeffects... +ALLTAR : $(INCCOM)/versionlist.hrc +$(INCCOM)/versionlist.hrc : ./inc/version.lst + $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@ + $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@ + $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@ + $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@ + $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@ + $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@ diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst index edbfc190c808..05ceea226515 100644..100755 --- a/solenv/prj/d.lst +++ b/solenv/prj/d.lst @@ -1,2 +1,4 @@ -mkdir: %_DEST%\bin%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
+mkdir: %_DEST%\bin%_EXT% +mkdir: %_DEST%\inc%_EXT% +..\inc\version.lst %_DEST%\bin%_EXT%\version.lst +..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc |