diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 19:45:04 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:11 +0000 |
commit | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (patch) | |
tree | e56530808fd0e0ec6cfa1eb58339c8cd467854f0 /sal/test | |
parent | Revert "sb140: sb140: #i116981# clean up memory upon exit" (diff) | |
download | core-f78a2bcce88dd5c12052ae3e55c561cdd48b05fe.tar.gz core-f78a2bcce88dd5c12052ae3e55c561cdd48b05fe.zip |
re-base on ALv2 code. Includes:
Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.
Diffstat (limited to 'sal/test')
-rw-r--r-- | sal/test/bootstrap | 17 | ||||
-rwxr-xr-x | sal/test/bootstrap.bat | 17 | ||||
-rw-r--r-- | sal/test/unloading/makefile.mk | 118 | ||||
-rw-r--r-- | sal/test/unloading/samplelib1.cxx | 37 | ||||
-rw-r--r-- | sal/test/unloading/samplelib1.xml | 17 | ||||
-rw-r--r-- | sal/test/unloading/samplelib2.cxx | 37 | ||||
-rw-r--r-- | sal/test/unloading/unloadTest.cxx | 37 |
7 files changed, 93 insertions, 187 deletions
diff --git a/sal/test/bootstrap b/sal/test/bootstrap index 6e307417e230..2ed2abfb62e2 100644 --- a/sal/test/bootstrap +++ b/sal/test/bootstrap @@ -1,4 +1,21 @@ #/bin/tcsh +# +# 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 . +# setenv MYBOOTSTRAPTESTVALUE 0 echo 1 diff --git a/sal/test/bootstrap.bat b/sal/test/bootstrap.bat index 2d3e9df3ccdf..c582ecc1a905 100755 --- a/sal/test/bootstrap.bat +++ b/sal/test/bootstrap.bat @@ -1,3 +1,20 @@ +rem +rem This file is part of the LibreOffice project. +rem +rem This Source Code Form is subject to the terms of the Mozilla Public +rem License, v. 2.0. If a copy of the MPL was not distributed with this +rem file, You can obtain one at http://mozilla.org/MPL/2.0/. +rem +rem This file incorporates work covered by the following license notice: +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed +rem with this work for additional information regarding copyright +rem ownership. The ASF licenses this file to you under the Apache +rem License, Version 2.0 (the "License"); you may not use this file +rem except in compliance with the License. You may obtain a copy of +rem the License at http://www.apache.org/licenses/LICENSE-2.0 . +rem @echo off set MYBOOTSTRAPTESTVALUE=0 echo 1 diff --git a/sal/test/unloading/makefile.mk b/sal/test/unloading/makefile.mk deleted file mode 100644 index 0eef383724af..000000000000 --- a/sal/test/unloading/makefile.mk +++ /dev/null @@ -1,118 +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= sal -TARGET= unloading -TARGET1=samplelib1 -TARGET2=samplelib2 -TARGETTYPE=CUI -COMP1TYPELIST=$(TARGET1) - -ENABLE_EXCEPTIONS=TRUE - -USE_DEFFILE= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+= $(LFS_CFLAGS) -CXXFLAGS+= $(LFS_CFLAGS) - -# --- Files -------------------------------------------------------- - -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb - -CPPUMAKERFLAGS = - -.IF "$(BOOTSTRAP_SERVICE)" == "TRUE" -UNOUCROUT= $(OUT)$/inc$/bootstrap -INCPRE+= $(OUT)$/inc$/bootstrap -.ELSE -.IF "$(COM)" == "MSC" -CPPUMAKERFLAGS = -L -.ENDIF -UNOUCROUT= $(OUT)$/inc$/light -INCPRE+= $(OUT)$/inc$/light -.ENDIF - - -LIB1TARGET=$(SLB)$/$(TARGET1).lib -LIB1OBJFILES= \ - $(SLO)$/samplelib1.obj - -SHL1TARGET= $(TARGET1) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1LIBS= $(SLB)$/$(TARGET1).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1EXPORTFILE= exports.dxp -DEF1NAME= $(SHL1TARGET) - -#------------------------------------------------------- - -LIB2TARGET=$(SLB)$/$(TARGET2).lib -LIB2OBJFILES= \ - $(SLO)$/samplelib2.obj - -SHL2TARGET= $(TARGET2) - -SHL2STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL2DEPN= -SHL2LIBS= $(SLB)$/$(TARGET2).lib -SHL2DEF= $(MISC)$/$(SHL2TARGET).def -DEF2EXPORTFILE= exports.dxp -DEF2NAME= $(SHL2TARGET) - -# ------------------------------------------------------------------ - -APP1NOSAL=TRUE - -APP1TARGET= $(TARGET) - -APP1OBJS= $(OBJ)$/unloadTest.obj - -APP1STDLIBS= \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx index 9cb2653cceec..1cde5d41caec 100644 --- a/sal/test/unloading/samplelib1.cxx +++ b/sal/test/unloading/samplelib1.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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. - * - ************************************************************************/ + * 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 <sal/types.h> #include <osl/time.h> diff --git a/sal/test/unloading/samplelib1.xml b/sal/test/unloading/samplelib1.xml index da1d0640a4bb..5b5953a416b0 100644 --- a/sal/test/unloading/samplelib1.xml +++ b/sal/test/unloading/samplelib1.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> +<!-- + * 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 . +--> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> <module-name> samplelib1 </module-name> <component-description> diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx index 19d3fc4b821d..f6f0f28da1f5 100644 --- a/sal/test/unloading/samplelib2.cxx +++ b/sal/test/unloading/samplelib2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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. - * - ************************************************************************/ + * 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 <sal/types.h> #include <osl/time.h> diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx index 7e709b811832..8733eebba23e 100644 --- a/sal/test/unloading/unloadTest.cxx +++ b/sal/test/unloading/unloadTest.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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. +/* + * This file is part of the LibreOffice project. * - * 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). + * 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/. * - * 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. + * 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<osl/module.hxx> #include <osl/time.h> |