[Libreoffice-commits] .: cli_ure/util cli_ure/workbench curl/makefile.mk dbaccess/util idl/util slideshow/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 06:14:11 PST 2012
cli_ure/util/target.pmk | 35 ------
cli_ure/workbench/dynload/dynload.cs | 53 ---------
cli_ure/workbench/dynload/makefile.mk | 59 ----------
cli_ure/workbench/dynload/readme.txt | 2
curl/makefile.mk | 190 ----------------------------------
dbaccess/util/dba.pmk | 20 ---
dbaccess/util/makefile.pmk | 22 ---
idl/util/makefile.mk | 59 ----------
slideshow/util/makefile.pmk | 38 ------
9 files changed, 478 deletions(-)
New commits:
commit 42db3c8036947142771577fd301894e9aa9a995b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 6 13:49:34 2012 +0000
commit delete various unused makefile.mks
Change-Id: I382423164fd65679d3b893ea0d9729508813b425
diff --git a/cli_ure/util/target.pmk b/cli_ure/util/target.pmk
deleted file mode 100644
index b463e52..0000000
--- a/cli_ure/util/target.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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 .
-#
-
-###### C# ######
-
-CSCFLAGS = -warnaserror+ -noconfig
-
-.IF "$(debug)" == ""
-
-.IF "$(product)" == ""
-CSCFLAGS += -checked+ -define:DEBUG -define:TRACE
-.ELSE
-CSCFLAGS += -o
-.ENDIF
-
-.ELSE # debug
-
-CSCFLAGS += -debug+ -checked+ -define:DEBUG -define:TRACE
-
-.ENDIF
diff --git a/cli_ure/workbench/dynload/dynload.cs b/cli_ure/workbench/dynload/dynload.cs
deleted file mode 100644
index 36c3e02..0000000
--- a/cli_ure/workbench/dynload/dynload.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 .
- */
-
-using System;
-using unoidl.com.sun.star.lang;
-using unoidl.com.sun.star.uno;
-using unoidl.com.sun.star.bridge;
-using unoidl.com.sun.star.frame;
-
-class DynLoad
-{
-
- static void Main(string[] args)
- {
- connect(args);
- }
-
-/** Connect to a running office that is accepting connections.
- @return The ServiceManager to instantiate office components. */
- static private XMultiServiceFactory connect( string[] args )
- {
- if (args.Length == 0)
- Console.WriteLine("You need to provide a file URL to the office" +
- " program folder\n");
- System.Collections.Hashtable ht = new System.Collections.Hashtable();
- ht.Add( "SYSBINDIR", args[ 0 ] );
- XComponentContext xContext =
- uno.util.Bootstrap.defaultBootstrap_InitialComponentContext(
- args[ 0 ] + "/uno.ini", ht.GetEnumerator() );
-
- if (xContext != null)
- Console.WriteLine("Successfully created XComponentContext\n");
- else
- Console.WriteLine("Could not create XComponentContext\n");
-
- return null;
- }
-}
diff --git a/cli_ure/workbench/dynload/makefile.mk b/cli_ure/workbench/dynload/makefile.mk
deleted file mode 100644
index e20fdcb..0000000
--- a/cli_ure/workbench/dynload/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = dynload
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-ALLTAR : \
- $(OUT)$/bin$/dynload.exe
-
-CSFILES = \
- dynload.cs
-
-$(OUT)$/bin$/dynload.exe : $(CSFILES)
- $(CSC) $(CSCFLAGS) \
- -target:exe \
- -out:$@ \
- -reference:$(OUT)$/bin$/cli_ure.dll \
- -reference:$(OUT)$/bin$/cli_types.dll \
- -reference:$(OUT)$/bin$/cli_cppuhelper.dll \
- -reference:System.dll \
- $(CSFILES)
-
-#$(OUT)$/bin$/dynload.ini : $(OUT)$/bin$/types.rdb
-# $(GNUCOPY) -p dynload.ini $(OUT)$/bin
-
-#$(OUT)$/bin$/types.rdb $(OUT)$/bin$/services.rdb
-
-#$(BIN)$/types.rdb : $(SOLARBINDIR)$/types.rdb
-# $(GNUCOPY) -p $? $@
-
-
-
-.ENDIF
diff --git a/cli_ure/workbench/dynload/readme.txt b/cli_ure/workbench/dynload/readme.txt
deleted file mode 100644
index 8a4fe91..0000000
--- a/cli_ure/workbench/dynload/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
- dynload.exe requires an installed office. It takes as argument a file URL to the program
-folder of the office.
diff --git a/curl/makefile.mk b/curl/makefile.mk
deleted file mode 100644
index 7a8d784..0000000
--- a/curl/makefile.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=.
-
-PRJNAME=so_curl
-TARGET=so_curl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_CURL)" == "YES"
-all:
- @echo "An already available installation of curl should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=curl-7.26.0
-TARFILE_MD5=3fa4d5236f2a36ca5c3af6715e837691
-PATCH_FILES=\
- curl-7.26.0.patch \
- curl-7.26.0_nspr.patch \
- curl-aix.patch
-
-.IF "$(GUI)"=="WNT"
- PATCH_FILES+=curl-7.26.0_win.patch
- .IF "$(COM)"=="GCC"
- PATCH_FILES+=curl-7.26.0_mingw.patch
- .ENDIF
-.ENDIF
-
-.IF "$(OS)" == "ANDROID"
- PATCH_FILES+=curl-android.patch
-.ENDIF
-
-#CONVERTFILES= \
- lib$/Makefile.vc6
-
-#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
-
-.IF "$(GUI)"=="UNX"
-
-.IF "$(SYSBASE)"!=""
-curl_CFLAGS+=-I$(SYSBASE)$/usr$/include
-curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
-.ENDIF # "$(SYSBASE)"!=""
-
-.IF "$(OS)$(CPU)"=="SOLARISU"
-curl_CFLAGS+:=$(ARCH_FLAGS)
-curl_LDFLAGS+:=$(ARCH_FLAGS)
-.ENDIF
-
-.IF "$(OS)"=="AIX"
-curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-CONFIGURE_DIR=.$/
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=.$/configure
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-CONFIGURE_FLAGS+= --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)"
-.IF "$(debug)" != ""
-CONFIGURE_FLAGS+=--enable-debug
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_DIR=$(CONFIGURE_DIR)$/lib
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
-.ELIF "$(OS)"=="ANDROID"
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so
-.ELSE
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).?
-.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-curl_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-curl_CC+=-shared-libgcc
-.ENDIF
-curl_LIBS=-lws2_32 -lwinmm
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-CONFIGURE_DIR=.$/
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS= --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)"
-.IF "$(debug)" != ""
-CONFIGURE_FLAGS+=--enable-debug
-.ENDIF
-BUILD_DIR=$(CONFIGURE_DIR)$/lib
-BUILD_ACTION=make
-OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
-.ELSE
-
-.IF "$(CCNUMVER)" > "001399999999"
-EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
-.ELSE
-EXCFLAGS="/EHsc /YX"
-.ENDIF
-
-BUILD_DIR=.$/lib
-
-.IF "$(CPUNAME)" == "INTEL"
-MACHINE=X86
-.ELSE
-MACHINE=X64
-.ENDIF
-
-# that debug configuration is disabled for now because it needs msvcr90d.dll
-# (the debug MSVC runtime) and that is not copied into the solver currently,
-# causing unit tests to fail
-#.IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
-#.ELSE
-#BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
-#.ENDIF
-
-OUT2BIN=$(BUILD_DIR)$/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/libcurl.lib
-
-.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
-
-OUT2INC= \
- include$/curl$/easy.h \
- include$/curl$/multi.h \
- include$/curl$/curl.h \
- include$/curl$/curlver.h \
- include$/curl$/typecheck-gcc.h \
- include$/curl$/stdcheaders.h \
- include$/curl$/mprintf.h \
- include$/curl$/curlbuild.h \
- include$/curl$/curlrules.h
-
-.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
-OUT2INC+=libcurl.pc
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/dbaccess/util/dba.pmk b/dbaccess/util/dba.pmk
deleted file mode 100644
index c19bad3..0000000
--- a/dbaccess/util/dba.pmk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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 .
-#
-
-VISIBILITY_HIDDEN = TRUE
-CDEFS += -DOOO_DLLIMPLEMENTATION_DBA
diff --git a/dbaccess/util/makefile.pmk b/dbaccess/util/makefile.pmk
deleted file mode 100644
index 20a0c05..0000000
--- a/dbaccess/util/makefile.pmk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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 .
-#
-
-# define DBACCESS_DLLIMPLEMENTATION (see @ dbaccessdllapi.h)
-CDEFS += -DDBACCESS_DLLIMPLEMENTATION
-
-VISIBILITY_HIDDEN=TRUE
diff --git a/idl/util/makefile.mk b/idl/util/makefile.mk
deleted file mode 100644
index e54e7aa..0000000
--- a/idl/util/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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 .
-#
-
-PRJ=..
-
-PRJNAME=idl
-TARGET=idl
-
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------------
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1FILES = $(LB)$/prj.lib \
- $(LB)$/objects.lib \
- $(LB)$/cmptools.lib
-
-APP1TARGET= svidl
-APP1RPATH=NONE
-
-APP1STDLIBS= \
- $(TOOLSLIB) \
- $(SALLIB)
-
-APP1LIBS= $(LB)$/$(TARGET).lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)"!="GCC"
-APP1OBJS= $(OBJ)$/svidl.obj \
- $(OBJ)$/command.obj
-.ENDIF
-.ENDIF
-
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-APP1STDLIBS+=-lcrypt
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk
deleted file mode 100644
index ada1e11..0000000
--- a/slideshow/util/makefile.pmk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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 .
-#
-
-.IF "$(VERBOSE)"=="TRUE"
-CDEFS+=-DVERBOSE
-.ENDIF
-
-.IF "$(debug)"!="" || "$(DEBUG)"!=""
-
-CDEFS += -DBOOST_SP_ENABLE_DEBUG_HOOKS
-
-.IF "$(COM)"=="MSC"
-# disable inlining for MSVC
-#CFLAGS += -Ob0
-.ENDIF
-
-.ENDIF # "$(debug)"!="" || "$(DEBUG)"!=""
-
-# # Turn off optimization module wide for SunCC
-# .IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-# NOOPTFILES = $(SLOFILES)
-# .ENDIF
-
More information about the Libreoffice-commits
mailing list