summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpputools/prj/d.lst2
-rw-r--r--cpputools/source/registercomponent/makefile.mk9
-rwxr-xr-xcpputools/source/registercomponent/regcomp.sh144
-rw-r--r--offapi/util/makefile.mk2
-rw-r--r--pyuno/source/loader/makefile.mk14
-rw-r--r--rdbmaker/source/rdbmaker/makefile.mk2
-rw-r--r--sal/rtl/source/makefile.mk3
-rw-r--r--sal/typesconfig/makefile.mk2
-rw-r--r--xml2cmp/util/makefile.mk2
9 files changed, 11 insertions, 169 deletions
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index 1e6a1440e6d4..fa029cc4deeb 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,6 +1,6 @@
..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
+..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\misc\regcomp.sh %_DEST%\bin%_EXT%\regcomp
..\%__SRC%\bin\regcomplazy.exe %_DEST%\bin%_EXT%\regcomplazy.exe
..\%__SRC%\bin\regcomplazy %_DEST%\bin%_EXT%\regcomplazy
..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index f0eb46e203d4..e03df0265a61 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -45,7 +45,6 @@ UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
NO_OFFUH=TRUE
CPPUMAKERFLAGS += -C
-UNIXTEXT= $(MISC)$/regcomp.sh
UNOTYPES=\
com.sun.star.uno.TypeClass \
com.sun.star.lang.XMultiServiceFactory \
@@ -78,11 +77,3 @@ APP1STDLIBS+= \
.INCLUDE : target.mk
-
-
-.IF "$(GUI)"=="UNX"
-ALLTAR: REGCOMPSH
-
-REGCOMPSH : $(UNIXTEXT)
- +-chmod +x $(UNIXTEXT)
-.ENDIF
diff --git a/cpputools/source/registercomponent/regcomp.sh b/cpputools/source/registercomponent/regcomp.sh
deleted file mode 100755
index 68a46450abb2..000000000000
--- a/cpputools/source/registercomponent/regcomp.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: regcomp.sh,v $
-#
-# $Revision: 1.4 $
-#
-# 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.
-#
-#*************************************************************************
-
-# resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
- sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
- cd "`dirname "$0"`"
- cd "`dirname "$sd_script"`"
-else
- cd "`dirname "$0"`"
-fi
-
-sd_prog="`pwd`"
-
-cd ..
-sd_binary=`basename "$0"`".bin"
-sd_inst="`pwd`"
-
-# change back directory
-cd "$sd_cwd"
-
-# set search path for shared libraries
-sd_platform=`uname -s`
-case $sd_platform in
- AIX)
- # this is a temporary hack until we can live with the default search paths
- if [ $LIBPATH ]; then
- SYSTEM_LIBPATH=$LIBPATH
- export SYSTEM_LIBPATH
- fi
- LIBPATH="$sd_prog":$LIBPATH
- export LIBPATH
- ;;
-
- Darwin)
- # this is a temporary hack until we can live with the default search paths
- if [ $DYLD_LIBRARY_PATH ]; then
- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
- export SYSTEM_DYLD_LIBRARY_PATH
- fi
- DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH
- ;;
-
- HP-UX)
- # this is a temporary hack until we can live with the default search paths
- if [ $SHLIB_PATH ]; then
- SYSTEM_SHLIB_PATH=$SHLIB_PATH
- export SYSTEM_SHLIB_PATH
- fi
- SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH
- export SHLIB_PATH
- ;;
-
- IRIX*)
- # this is a temporary hack until we can live with the default search paths
- if [ $LD_LIBRARYN32_PATH ]; then
- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
- export SYSTEM_LD_LIBRARYN32_PATH
- fi
- LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH
- export LD_LIBRARYN32_PATH
- ;;
-
- *)
- # this is a temporary hack until we can live with the default search paths
- if [ $LD_LIBRARY_PATH ]; then
- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
- export SYSTEM_LD_LIBRARY_PATH
- fi
- LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH
- export LD_LIBRARY_PATH
- ;;
-esac
-
-#collect all bootstrap variables specified on the command line
-#so that they can be passed as arguments to javaldx later on
-for arg in $@
-do
- case "$arg" in
- -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
- esac
-done
-
-# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/javaldx" ] ; then
- java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
- if [ "$java_ld_library_path" != "" ] ; then
- case $sd_platform in
- AIX)
- LIBPATH=${java_ld_library_path}:${LIBPATH}
- ;;
- Darwin)
- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
- ;;
- HP-UX)
- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
- ;;
- IRIX*)
- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
- ;;
- *)
- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
- ;;
- esac
- fi
-fi
-
-
-
-# execute binary
-exec "$sd_prog/$sd_binary" "$@"
-
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 069b11e60760..6e4a41503a56 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -183,6 +183,6 @@ $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
#JSC: new target to prepare some UNO type statistics, the ouput will be later used
# for versioning of UNO cli type libraries
$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
- $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+ $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
.INCLUDE : target.mk
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index ea5d907250bc..67fbe81e482e 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -94,7 +94,7 @@ COMPONENTS= \
invocadapt.uno \
proxyfac.uno \
reflection.uno \
- pythonloader.uno
+ .$/pythonloader.uno
# --- Targets ------------------------------------------------------
@@ -107,20 +107,12 @@ ALL : ALLTAR \
$(DLLDEST)$/%.py: %.py
cp $? $@
-# For Mac OS X,
-# The python loader component is linked against libpyuno.dylib,
-# which hasn't been delivered yet but dyld needs to know where it is
-# so regcomp can load the component.
$(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST)
-rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
-.IF "$(OS)"=="MACOSX"
- cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
-.ELSE
.IF "$(GUI)$(COM)"=="WNTGCC"
- cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
+ cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))"
.ELSE
- cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
+ cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # $(OS)=="MACOSX"
cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 5378364e8edb..8d29743a5607 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -62,4 +62,6 @@ APP1STDLIBS=\
APP1LIBS= \
$(LB)$/codemaker.lib
+APP1RPATH= NONE
+
.INCLUDE : target.mk
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 20d227baaca5..0d6447d64758 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -140,6 +140,7 @@ OBJFILES+=$(OBJ)$/memory_fini.obj
APP1TARGET=gen_makefile
APP1OBJS=$(SLO)$/gen_makefile.obj
APP1LIBSALCPPRT=
+APP1RPATH=NONE
# --- Extra objs ----------------------------------------------------
@@ -197,5 +198,5 @@ $(ALWAYSDBGFILES):
ALLTAR : $(BOOTSTRAPMK)
$(BOOTSTRAPMK) : $(APP1TARGETN)
- $< > $@
+ $(AUGMENT_LIBRARY_PATH) $< > $@
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
index 6591b2c55ed4..292f5e2843ba 100644
--- a/sal/typesconfig/makefile.mk
+++ b/sal/typesconfig/makefile.mk
@@ -61,5 +61,5 @@ ALLTAR : $(INCCOM)$/sal$/typesizes.h
$(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
-$(MKDIR) $(INCCOM)$/sal
- $(BIN)$/$(TARGET) $@
+ $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET) $@
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
index 054cbbf3f056..7252e8fbaa1e 100644
--- a/xml2cmp/util/makefile.mk
+++ b/xml2cmp/util/makefile.mk
@@ -55,7 +55,7 @@ LIBSALCPPRT=$(0)
APP1LIBS= $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
APP1DEPN= $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
-
+APP1RPATH= NONE
.INCLUDE : target.mk
generated by cgit (git 2.34.1) at 2025-01-26 19:30:05 +0000