diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 14:19:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 14:19:02 +0000 |
| commit | bdc96df9366201ab22dd7a6e73016044f7d569ab (patch) | |
| tree | 4ada670f8dedbbb8cb170eafbb2efcf891ec1dac /pyuno | |
| parent | 3a64cd51333432459cd8ec08182a93660721cede (diff) | |
INTEGRATION: CWS ooo11rc (1.2.2); FILE MERGED
2003/06/29 08:17:53 jbu 1.2.2.3: #i15917# + #i16131# removed unneeded stuff, directories are now created during each file copy, now SMP buildable, builds on all shells
2003/06/25 18:40:58 jbu 1.2.2.2: #i15974# problems during creation of directories fixed, .pyc aren't copied now anymore
2003/06/20 16:10:50 jbu 1.2.2.1: #i15866# now builds also, when win-volums of solver and project are different
Diffstat (limited to 'pyuno')
| -rwxr-xr-x | pyuno/zipcore/makefile.mk | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index 68a544dc7e09..307808623239 100755 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -5,40 +5,18 @@ PRJ=.. .INCLUDE : pyversion.mk PYDIRNAME=python-core-$(PYVERSION) -PACKSUFFIX=.zip DESTROOT=$(BIN)$/python-core-$(PYVERSION) +PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST) -.IF "$(GUI)"=="WNT" -INISUFFIX=.ini -BATCHSUFFIX=.bat -ENVSUFFIX=.bat -EXESUFFIX=.exe -DOLLAR_SIGN=$$ -.ELSE -DOLLAR_SIGN=\$$ -BATCHSUFFIX=.sh -ENVSUFFIX=.tcsh -INISUFFIX=rc -.ENDIF -PYTHONBINARY=$(BIN)$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) - -FINDDIRS=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type d)) -FINDLIBFILES=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type f)) - -PYRUNTIME_DIRS=\ - $(BIN)$/$(PYDIRNAME) \ - $(BIN)$/$(PYDIRNAME)$/bin \ - $(BIN)$/$(PYDIRNAME)$/lib \ - $(foreach,i,$(FINDDIRS) $(BIN)$/$(PYDIRNAME)$/lib$/$(i)) - +FINDLIBFILES_TMP:=$(subst,/,$/ \ + $(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc )) +FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) FILES=\ $(PYTHONBINARY) \ - $(foreach,i,$(FINDLIBFILES) $(BIN)$/$(PYDIRNAME)$/lib$/$(i)) - + $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) target: \ - dirs \ $(BIN)$/python-core-$(PYVERSION).zip \ $(BIN)$/python.sh @@ -50,23 +28,21 @@ $(BIN)$/python.sh : python.sh .ENDIF $(BIN)$/python-core-$(PYVERSION).zip : $(FILES) - -+cd $(BIN) && find . -name '*.pyc' | xargs rm -f .IF "$(GUI)" == "UNX" cd $(BIN) && find . -name '*.so' | xargs strip .ENDIF -rm -f $@ +cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME) -dirs .PHONY: - -+$(MKDIR) $(PYRUNTIME_DIRS) - -$(BIN)$/$(PYDIRNAME)$/lib$/% : $(SOLARLIBDIR)$/python$/% +$(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/% + -+$(MKDIRHIER) $(@:d) -rm -f $@ - cat $? > $@ + cat $< > $@ -$(BIN)$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) : $(SOLARBINDIR)$/python$(EXESUFFIX) +$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) + -+$(MKDIRHIER) $(@:d) -rm -f $@ - cat $? > $@ + cat $< > $@ .IF "$(GUI)"== "UNX" chmod +x $@ .ENDIF |