Kaydet (Commit) 3d6d07a7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist

Get rid of GetVersionInfo and checkdll

With gbuildification neither was actually used anyway, as far as I
could see.

Change-Id: I00d914e6571aed3110226f91ac1685a838031c65
üst c5fc0af6
......@@ -34,7 +34,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
bmp \
bmpsum \
cfgex \
checkdll \
cpp \
cppunit/cppunittester \
g2g \
......
......@@ -104,9 +104,6 @@ CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
.ELSE
MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql$(DLLPOST).16
.ENDIF
# checkdll will complain if we do not point it to the libmysql lib
EXTRALIBPATHS=-L$(MYSQL_LIBDIR)
.ENDIF
.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
......
......@@ -17,7 +17,6 @@
#
UDK_3_0_0 {
global:
GetVersionInfo;
_fini;
_init;
......
......@@ -18,7 +18,6 @@
UDK_3_0_0 { # should have been UDK_3.0
global:
GetVersionInfo;
_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_;
_ZN9salhelper18ORealDynamicLoader7acquireEv;
_ZN9salhelper18ORealDynamicLoader7releaseEv;
......
#! /bin/sh
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# 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.
#
#*************************************************************************
# checkdll.sh - execute checkdll with all -L arguments to this script
# prepended to LD_LIBRARY_PATH
set -- `getopt "L:" "$@"` || {
echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2
exit 1
}
checkdll="$SOLARVERSION/$INPATH/bin/checkdll"
if [ -x $checkdll ]; then
while :
do
case $1 in
-L) shift; option=$1;;
--) break;;
esac
case "${libpath:+X}" in
X) libpath=$libpath:$option;;
*) libpath=$option;;
esac
shift
done
shift # remove the trailing ---
case `uname -s` in
Darwin) case "${DYLD_LIBRARY_PATH:+X}" in
X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
*) DYLD_LIBRARY_PATH=$libpath;;
esac
export DYLD_LIBRARY_PATH;;
AIX) case "${LIBPATH:+X}" in
X) LIBPATH=$libpath:$LIBPATH;;
*) LIBPATH=$libpath;;
esac
export LIBPATH;;
*) case "${LD_LIBRARY_PATH:+X}" in
X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
*) LD_LIBRARY_PATH=$libpath;;
esac
export LD_LIBRARY_PATH;;
esac
$checkdll "$@"
if [ $? -ne 0 ]; then exit 1 ; fi
for parameter in $*; do
library=$parameter;
done
realname=`echo $library | sed "s/check_//"`
if [ $library != $realname ]; then
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
mv $library $realname
fi
else
for parameter in $*; do
library=$parameter;
done
realname=`echo $library | sed "s/check_//"`
if [ $library != $realname ]; then
mv $library $realname
fi
fi
exit 0
......@@ -63,10 +63,6 @@ $(DEF1TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB1NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
......@@ -232,10 +228,6 @@ $(DEF2TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB2NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
......@@ -401,10 +393,6 @@ $(DEF3TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB3NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
......@@ -570,10 +558,6 @@ $(DEF4TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB4NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
......@@ -739,10 +723,6 @@ $(DEF5TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB5NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
......@@ -908,10 +888,6 @@ $(DEF6TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB6NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
......@@ -1077,10 +1053,6 @@ $(DEF7TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB7NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
......@@ -1246,10 +1218,6 @@ $(DEF8TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB8NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
......@@ -1415,10 +1383,6 @@ $(DEF9TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB9NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
......@@ -1584,10 +1548,6 @@ $(DEF10TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB10NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
......
This diff is collapsed.
......@@ -92,10 +92,6 @@ $(DEF$(TNR)TARGETN) .PHONY :
$(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
$(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
$(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB$(TNR)NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
......
......@@ -63,26 +63,6 @@ EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS)
EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
.IF "$(L10N_framework)"==""
.IF "$(VERSIONOBJ)"!=""
SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
.IF "$(OS)" != "WNT"
SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
.ELSE # "$(OS)" != "WNT"
SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
.INIT : $(SHL$(TNR)VERSIONOBJDEP)
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
.IF "$(OS)" == "WNT"
.IF "$(OS)" == "WNT"
......@@ -317,7 +297,7 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \
$(STDOBJ) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
$(SHL$(TNR)OBJS) \
$(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
-Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
......@@ -339,7 +319,7 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \
$(STDOBJ) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
$(SHL$(TNR)OBJS) \
$(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
-Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
......@@ -359,7 +339,7 @@ $(SHL$(TNR)TARGETN) : \
-def:$(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \
$(STDOBJ) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
$(SHL$(TNR)OBJS) \
$(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
......@@ -383,7 +363,7 @@ $(SHL$(TNR)TARGETN) : \
-map:$(MISC)/$(@:B).map \
$(LB)/$(SHL$(TNR)IMPLIB).exp \
$(STDOBJ) \
$(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
$(SHL$(TNR)OBJS) \
$(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
......@@ -408,7 +388,7 @@ $(SHL$(TNR)TARGETN) : \
-map:$(MISC)/$(@:B).map \
$(USE_$(TNR)IMPLIB) \
$(STDOBJ) \
$(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ)) \
$(SHL$(TNR)OBJS) ) \
$(SHL$(TNR)LIBS) \
@$(mktmp $(SHL$(TNR)STDLIBS) \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
......@@ -458,7 +438,6 @@ $(SHL$(TNR)TARGETN) : \
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
$(SHL$(TNR)VERSIONOBJ) \
`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
@/bin/echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
......@@ -475,16 +454,13 @@ $(SHL$(TNR)TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL$(TNR)CREATEJNILIB)"!=""
.IF "$(SHL$(TNR)NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
$(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
.ELSE # "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
$(SHL$(TNR)VERSIONOBJ) -o $@ \
-o $@ \
`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
.IF "$(VERBOSE)" == "TRUE"
......@@ -494,11 +470,6 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(SHL$(TNR)NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
.IF "$(VERBOSE)"=="TRUE"
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
.ELSE
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
.ENDIF
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
......
......@@ -133,8 +133,6 @@ $(DEF1TARGETN_X64) : \
@echo LIBRARY $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" >$@.tmpfile
@echo HEAPSIZE 0 >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
# getversioninfo fuer alle!!
@echo GetVersionInfo >>$@.tmpfile
.IF "$(DEFLIB1NAME_X64)"!=""
.IF "$(SHL1USE_EXPORTS_X64)"==""
@-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp
......@@ -170,8 +168,6 @@ $(DEF2TARGETN_X64) : \
@echo LIBRARY $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" >$@.tmpfile
@echo HEAPSIZE 0 >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
# getversioninfo fuer alle!!
@echo GetVersionInfo >>$@.tmpfile
.IF "$(DEFLIB2NAME_X64)"!=""
.IF "$(SHL2USE_EXPORTS_X64)"==""
@-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp
......@@ -201,15 +197,6 @@ $(DEF2TARGETN_X64) : \
# -------------------------------- shl -----------------------------------------
.IF "$(SHL1TARGET_X64)"!=""
.IF "$(VERSIONOBJ_X64)"!=""
SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
$(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
.INIT : $(SHL1VERSIONOBJDEP_X64)
.ENDIF
.IF "$(USE_DEFFILE_X64)"==""
USE_1IMPLIB_DEPS_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
.ENDIF # "$(USE_DEFFILE_X64)"==""
......@@ -271,7 +258,7 @@ $(SHL1TARGETN_X64) : \
-def:$(SHL1DEF_X64) \
$(USE_1IMPLIB_X64) \
$(STDOBJ_X64) \
$(SHL1VERSIONOBJ_X64) $(SHL1OBJS_X64) \
$(SHL1OBJS_X64) \
$(SHL1LIBS_X64) \
$(SHL1STDLIBS_X64) \
$(SHL1STDSHL_X64) $(STDSHL1_X64) \
......@@ -295,7 +282,7 @@ $(SHL1TARGETN_X64) : \
-map:$(MISC_X64)/$(@:B).map \
$(LB_X64)/$(SHL1IMPLIB_X64).exp \
$(STDOBJ_X64) \
$(SHL1OBJS_X64) $(SHL1VERSIONOBJ_X64) \
$(SHL1OBJS_X64) \
$(SHL1LIBS_X64) \
$(SHL1STDLIBS_X64) \
$(SHL1STDSHL_X64) $(STDSHL1_X64) \
......@@ -346,15 +333,6 @@ ALLTAR : $(SHL2IMPLIBN_X64)
.ENDIF # "$(LIBTARGET)" == ""
.IF "$(SHL2TARGET_X64)"!=""
.IF "$(VERSIONOBJ_X64)"!=""
SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
$(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
.INIT : $(SHL2VERSIONOBJDEP_X64)
.ENDIF
.IF "$(USE_DEFFILE_X64)"==""
USE_2IMPLIB_DEPS_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib
.ENDIF # "$(USE_DEFFILE_X64)"==""
......@@ -416,7 +394,7 @@ $(SHL2TARGETN_X64) : \
-def:$(SHL2DEF_X64) \
$(USE_2IMPLIB_X64) \
$(STDOBJ_X64) \
$(SHL2VERSIONOBJ_X64) $(SHL2OBJS_X64) \
$(SHL2OBJS_X64) \
$(SHL2LIBS_X64) \
$(SHL2STDLIBS_X64) \
$(SHL2STDSHL_X64) $(STDSHL2_X64) \
......@@ -440,7 +418,7 @@ $(SHL2TARGETN_X64) : \
-map:$(MISC_X64)/$(@:B).map \
$(LB_X64)/$(SHL2IMPLIB_X64).exp \
$(STDOBJ_X64) \
$(SHL2OBJS_X64) $(SHL2VERSIONOBJ_X64) \
$(SHL2OBJS_X64) \
$(SHL2LIBS_X64) \
$(SHL2STDLIBS_X64) \
$(SHL2STDSHL_X64) $(STDSHL2_X64) \
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <_version.h>
struct VersionInfo
{
const char* pTime;
const char* pDate;
const char* pUpd;
const char* pMinor;
const char* pBuild;
const char* pInpath;
};
static const struct VersionInfo g_aVersionInfo =
{
__TIME__,
__DATE__,
_UPD,
_LAST_MINOR,
_BUILD,
_INPATH
};
#if defined(WNT)
__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void);
#endif
#if defined(WNT)
__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void)
#else
const struct VersionInfo *GetVersionInfo(void)
#endif
{
return &g_aVersionInfo;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Executable_Executable,checkdll))
ifeq ($(COM),MSC)
$(eval $(call gb_Executable_use_packages,checkdll,\
soltools_inc \
))
endif
$(eval $(call gb_Executable_add_cobjects,checkdll,\
soltools/checkdll/checkdll \
))
ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Executable_add_libs,checkdll,\
-ldl \
))
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
......@@ -16,12 +16,6 @@ $(eval $(call gb_Module_add_targets,soltools,\
Executable_makedepend \
))
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,soltools,\
Executable_checkdll \
))
endif # UNX
ifeq ($(OS)$(COM),SOLARISC52)
$(eval $(call gb_Module_add_targets,soltools,\
Executable_adjustvisibility \
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <dlfcn.h>
/*
* NOTE: Since no one is really interested in correct unload behavior I've
* disabled the shared library unload check. If you want to reenable it comment
* the following line out
*/
#define NO_UNLOAD_CHECK
static const char *pprog_name = "checkdll";
static const char *psymbol = "GetVersionInfo";
void usage()
{
fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
return;
}
int main(int argc, char *argv[])
{
int silent=0;
void *phandle;
char *(*pfun)(void);
if ( argc < 2 || argc > 4) {
usage();
return 1;
}
if ( !strcmp(argv[1],"-s") ) {
silent = 1;
++argv, --argc;
}
if ( access( argv[1], R_OK ) == -1 ) {
fprintf(stderr, "%s: ERROR: %s: %s\n",
pprog_name, argv[1], strerror(errno));
return 2;
}
if (!silent) printf("Checking DLL %s ...", argv[1]);
fflush(stdout);
if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
if (!silent) printf(": ok\n");
}
else
{
printf(": WARNING: %s\n", dlerror());
}
#ifdef NO_UNLOAD_CHECK
_exit(0);
#else
dlclose(phandle);
#endif
return 0;
}
printf(": ERROR: %s\n", dlerror());
return 3;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -18,7 +18,6 @@
UDK_3_0_0 {
global:
GetVersionInfo;
DllCanUnloadNow;
DllGetClassObject;
DllRegisterServer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment