From 613221bde1744265c336c2b5f2ade0bfb9b22d16 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 21 Feb 2013 00:56:13 -0600 Subject: convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Reviewed-on: https://gerrit.libreoffice.org/2288 Reviewed-by: Peter Foley Tested-by: Peter Foley --- odk/source/com/sun/star/lib/loader/makefile.mk | 47 ----------- odk/source/unoapploader/unx/makefile.mk | 52 ------------- odk/source/unoapploader/win/makefile.mk | 49 ------------ odk/source/unowinreg/win/makefile.mk | 104 ------------------------- odk/source/unowinreg/win/unowinreg.def | 11 +++ odk/source/unowinreg/win/unowinreg.dxp | 9 --- 6 files changed, 11 insertions(+), 261 deletions(-) delete mode 100644 odk/source/com/sun/star/lib/loader/makefile.mk delete mode 100644 odk/source/unoapploader/unx/makefile.mk delete mode 100644 odk/source/unoapploader/win/makefile.mk delete mode 100644 odk/source/unowinreg/win/makefile.mk create mode 100755 odk/source/unowinreg/win/unowinreg.def delete mode 100644 odk/source/unowinreg/win/unowinreg.dxp (limited to 'odk/source') diff --git a/odk/source/com/sun/star/lib/loader/makefile.mk b/odk/source/com/sun/star/lib/loader/makefile.mk deleted file mode 100644 index c8d5725fac51..000000000000 --- a/odk/source/com/sun/star/lib/loader/makefile.mk +++ /dev/null @@ -1,47 +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 = odk -PACKAGE = com$/sun$/star$/lib$/loader -TARGET = com_sun_star_lib_loader - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building javaunohelper because Java is disabled" -.ENDIF - -# Files -------------------------------------------------------- - -JAVAFILES= \ - Loader.java\ - InstallationFinder.java\ - WinRegKey.java\ - WinRegKeyException.java - -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk deleted file mode 100644 index a595df53e25c..000000000000 --- a/odk/source/unoapploader/unx/makefile.mk +++ /dev/null @@ -1,52 +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=odk -TARGET=unoapploader -LIBTARGET=NO - -LIBSALCPPRT= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(COM)"=="GCC" -LINK=$(CC) -.ENDIF - -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="DRAGONFLY" -STDLIB= -ldl -.ENDIF - - -APP1NOSAL=TRUE -APP1RPATH=NONE - -APP1TARGET= $(TARGET) - -APP1OBJS= $(OBJ)$/unoapploader.obj -APP1STDLIBS=-lfindsofficepath - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/odk/source/unoapploader/win/makefile.mk b/odk/source/unoapploader/win/makefile.mk deleted file mode 100644 index 3c573b40c663..000000000000 --- a/odk/source/unoapploader/win/makefile.mk +++ /dev/null @@ -1,49 +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=odk -TARGET=unoapploader -TARGETTYPE=GUI -LIBTARGET=NO - -DYNAMIC_CRT= -UWINAPILIB= -NO_DEFAULT_STL=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -APP1NOSAL=TRUE -APP1RPATH=NONE - -APP1TARGET= $(TARGET) - -APP1OBJS= $(OBJ)$/unoapploader.obj -APP1STDLIBS=findsofficepath.lib - -APP1STDLIBS+=\ - $(ADVAPI32LIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk deleted file mode 100644 index e5fadd3cf2f0..000000000000 --- a/odk/source/unowinreg/win/makefile.mk +++ /dev/null @@ -1,104 +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=odk -TARGET=unowinreg -ENABLE_EXCEPTIONS=TRUE - -NO_DEFAULT_STL=TRUE -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -JAVA_INCLUDES:= -I$(JAVA_HOME)/include - -.IF "$(OS)" == "LINUX" -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux -.ELIF "$(OS)" == "FREEBSD" -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/freebsd -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/bsd -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux -.ELIF "$(OS)" == "NETBSD" -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd -.ENDIF - -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building javaunohelper because Java is disabled" -.ENDIF - -.IF "$(OS)" != "WNT" - -.IF "$(BUILD_UNOWINREG)" == "YES" - -$(BIN)$/unowinreg.dll : unowinreg.cxx - $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \ - -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \ - -Wl,--kill-at -lkernel32 -ladvapi32 - $(MINGWSTRIP) $(BIN)$/unowinreg.dll - -.ELSE - -$(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/$(UNOWINREG_DLL) - @@-rm -f $@ - $(GNUCOPY) $< $@ - -.ENDIF - -.ELSE # "$(OS)" != "WNT" -# Always build unowinreg.dll on windows - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unowinreg.obj -SHL1TARGET=$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib - -#No default libraries -STDSHL= -.IF "$(COM)"=="GCC" -SHL1STDLIBS += -lstdc++ -.IF "$(MINGW_GCCLIB_EH)"=="YES" -SHL1STDLIBS += -lgcc_eh -.ENDIF -SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt -.ELSE -LINKFLAGS+=-MANIFEST:NO -.ENDIF - -SHL1STDLIBS +=\ - $(KERNEL32LIB)\ - $(ADVAPI32LIB) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=$(TARGET).dxp -DEF1DES=unowinreg - -.ENDIF # "$(OS)" != "WNT" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/odk/source/unowinreg/win/unowinreg.def b/odk/source/unowinreg/win/unowinreg.def new file mode 100755 index 000000000000..232261b99fb7 --- /dev/null +++ b/odk/source/unowinreg/win/unowinreg.def @@ -0,0 +1,11 @@ +LIBRARY "unowinreg.dll" +EXPORTS + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenClassesRoot + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentConfig + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentUser + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenLocalMachine + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenUsers + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenKeyEx + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegCloseKey + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryValueEx + Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryInfoKey diff --git a/odk/source/unowinreg/win/unowinreg.dxp b/odk/source/unowinreg/win/unowinreg.dxp deleted file mode 100644 index af44919d42a9..000000000000 --- a/odk/source/unowinreg/win/unowinreg.dxp +++ /dev/null @@ -1,9 +0,0 @@ -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenClassesRoot -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentConfig -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentUser -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenLocalMachine -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenUsers -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenKeyEx -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegCloseKey -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryValueEx -Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryInfoKey -- cgit