make gengal work again
This commit is contained in:
Rene Engelhard
parent
699b3b662c
commit
d40a7f18a8
@ -84,6 +84,7 @@ else
|
||||
$(eval $(call gb_Helper_register_executables,OOO,\
|
||||
soffice.bin \
|
||||
unopkg.bin \
|
||||
gengal.bin \
|
||||
))
|
||||
|
||||
ifeq ($(OS),MACOSX)
|
||||
|
||||
@ -124,6 +124,28 @@ End
|
||||
#endif
|
||||
#endif
|
||||
|
||||
File gid_File_Bin_Gengal
|
||||
BIN_FILE_BODY;
|
||||
Dir = gid_Brand_Dir_Program;
|
||||
Styles = (PACKED);
|
||||
#ifdef UNX
|
||||
Name = "gengal.bin";
|
||||
#else
|
||||
Name = "gengal.exe";
|
||||
#endif
|
||||
End
|
||||
|
||||
#ifdef UNX
|
||||
|
||||
File gid_File_Script_Gengal
|
||||
BIN_FILE_BODY;
|
||||
Dir = gid_Brand_Dir_Program;
|
||||
Styles = (PACKED);
|
||||
Name = "gengal";
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
|
||||
|
||||
File gid_File_Bin_Pluginapp
|
||||
|
||||
80
svx/Executable_gengal.bin.mk
Normal file
80
svx/Executable_gengal.bin.mk
Normal file
@ -0,0 +1,80 @@
|
||||
#*************************************************************************
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
$(eval $(call gb_Executable_Executable,gengal.bin))
|
||||
|
||||
$(eval $(call gb_Executable_set_include,gengal.bin,\
|
||||
$$(INCLUDE) \
|
||||
-I$(SRCDIR)/svx/inc/ \
|
||||
-I$(SRCDIR)/svx/inc/pch \
|
||||
-I$(OUTDIR)/inc/offuh \
|
||||
-I$(OUTDIR)/inc/udkapi \
|
||||
-I$(OUTDIR)/inc/offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
|
||||
$$(CXXFLAGS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
|
||||
sal \
|
||||
tl \
|
||||
svl \
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
vcl \
|
||||
ucbhelper \
|
||||
svxcore \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
|
||||
svx/source/gengal/gengal \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
|
||||
vclmain \
|
||||
))
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
|
||||
kernel32 \
|
||||
msvcrt \
|
||||
oldnames \
|
||||
user32 \
|
||||
uwinapi \
|
||||
))
|
||||
endif
|
||||
|
||||
ifeq ($(OS),LINUX)
|
||||
$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
|
||||
dl \
|
||||
pthread \
|
||||
))
|
||||
endif
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@ -39,6 +39,8 @@ $(eval $(call gb_Module_add_targets,svx,\
|
||||
Package_globlmn_hrc \
|
||||
Package_inc \
|
||||
Package_sdi \
|
||||
Package_gengal \
|
||||
Executable_gengal.bin \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
|
||||
|
||||
31
svx/Package_gengal.mk
Normal file
31
svx/Package_gengal.mk
Normal file
@ -0,0 +1,31 @@
|
||||
#*************************************************************************
|
||||
#
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# Copyright 2000, 2011 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.
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
$(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal))
|
||||
$(eval $(call gb_Package_add_file,svx_gengal,bin/gengal,gengal.sh))
|
||||
|
||||
# vim: set noet ts=4 sw=4:
|
||||
@ -64,7 +64,7 @@
|
||||
#include <osl/process.h>
|
||||
#include <rtl/bootstrap.hxx>
|
||||
|
||||
#include <galtheme.hxx>
|
||||
#include <svx/galtheme.hxx>
|
||||
#include <svx/gallery1.hxx>
|
||||
|
||||
using namespace ::com::sun::star::uno;
|
||||
@ -97,7 +97,7 @@ void disposeGallery( Gallery* pGallery )
|
||||
static void createTheme( rtl::OUString aThemeName,
|
||||
rtl::OUString aGalleryURL,
|
||||
rtl::OUString aDestDir,
|
||||
UINT32 nNumFrom,
|
||||
sal_uInt32 nNumFrom,
|
||||
FileNameList &rFiles )
|
||||
{
|
||||
Gallery * pGallery( createGallery( aGalleryURL ) );
|
||||
@ -275,10 +275,10 @@ int GalApp::Main()
|
||||
bool bHelp = false;
|
||||
rtl::OUString aPath, aDestDir;
|
||||
rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
|
||||
UINT32 nNumFrom = 0;
|
||||
sal_uInt32 nNumFrom = 0;
|
||||
FileNameList aFiles;
|
||||
|
||||
for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
|
||||
for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
|
||||
{
|
||||
rtl::OUString aParam = GetCommandLineParam( i );
|
||||
|
||||
|
||||
103
svx/source/gengal/gengal.sh
Normal file
103
svx/source/gengal/gengal.sh
Normal file
@ -0,0 +1,103 @@
|
||||
#!/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.
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
# enable file locking
|
||||
SAL_ENABLE_FILE_LOCKING=1
|
||||
export SAL_ENABLE_FILE_LOCKING
|
||||
|
||||
# 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"
|
||||
|
||||
# check if all required patches are installed
|
||||
if [ -x "$sd_prog/sopatchlevel.sh" ]; then
|
||||
"$sd_prog/sopatchlevel.sh"
|
||||
if [ $? -eq 1 ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
# set search path for shared libraries
|
||||
sd_platform=`uname -s`
|
||||
sd_prog1="$sd_prog/../basis-link/program"
|
||||
sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
||||
case $sd_platform in
|
||||
AIX)
|
||||
LIBPATH=${sd_prog1}:${sd_prog2}${LIBPATH+:${LIBPATH}}
|
||||
export LIBPATH
|
||||
;;
|
||||
|
||||
Darwin)
|
||||
DYLD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
|
||||
export DYLD_LIBRARY_PATH
|
||||
;;
|
||||
|
||||
HP-UX)
|
||||
SHLIB_PATH=${sd_prog1}:${sd_prog2}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
|
||||
export SHLIB_PATH
|
||||
;;
|
||||
|
||||
*)
|
||||
LD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH
|
||||
;;
|
||||
esac
|
||||
|
||||
# misc. environment variables
|
||||
unset XENVIRONMENT
|
||||
|
||||
# set path so that other apps can be started just by name
|
||||
PATH="$sd_prog":$PATH
|
||||
export PATH
|
||||
|
||||
OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
|
||||
if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
|
||||
# Hack for vanilla OOo binaries' split install layout
|
||||
OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
|
||||
fi
|
||||
|
||||
export OOO_INSTALL_PREFIX
|
||||
|
||||
# execute binary
|
||||
exec "$sd_prog/$sd_binary" "$@"
|
||||
Loading…
x
Reference in New Issue
Block a user