[PATCH] move sal_inc headers to include/

Sat Apr 20 06:14:27 PDT 2013

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3501

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3501/1

move sal_inc headers to include/

Change-Id: I840c681b7c500640d3983e05e9895f3fa8bb1313
---
R include/cppunittester/protectorfactory.hxx
R include/osl/detail/android-bootstrap.h
R include/osl/detail/component-mapping.h
R include/osl/detail/file.h
R include/osl/detail/ios-bootstrap.h
R include/systools/win32/comptr.hxx
R include/systools/win32/comtools.hxx
R include/systools/win32/qswin32.h
R include/systools/win32/uwinapi.h
M sal/Module_sal.mk
D sal/Package_inc.mk
M unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
M unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
13 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/include/cppunittester/protectorfactory.hxx
similarity index 100%
rename from sal/inc/cppunittester/protectorfactory.hxx
rename to include/cppunittester/protectorfactory.hxx
diff --git a/sal/inc/osl/detail/android-bootstrap.h b/include/osl/detail/android-bootstrap.h
similarity index 100%
rename from sal/inc/osl/detail/android-bootstrap.h
rename to include/osl/detail/android-bootstrap.h
diff --git a/sal/inc/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
similarity index 100%
rename from sal/inc/osl/detail/component-mapping.h
rename to include/osl/detail/component-mapping.h
diff --git a/sal/inc/osl/detail/file.h b/include/osl/detail/file.h
similarity index 100%
rename from sal/inc/osl/detail/file.h
rename to include/osl/detail/file.h
diff --git a/sal/inc/osl/detail/ios-bootstrap.h b/include/osl/detail/ios-bootstrap.h
similarity index 100%
rename from sal/inc/osl/detail/ios-bootstrap.h
rename to include/osl/detail/ios-bootstrap.h
diff --git a/sal/inc/systools/win32/comptr.hxx b/include/systools/win32/comptr.hxx
similarity index 100%
rename from sal/inc/systools/win32/comptr.hxx
rename to include/systools/win32/comptr.hxx
diff --git a/sal/inc/systools/win32/comtools.hxx b/include/systools/win32/comtools.hxx
similarity index 100%
rename from sal/inc/systools/win32/comtools.hxx
rename to include/systools/win32/comtools.hxx
diff --git a/sal/inc/systools/win32/qswin32.h b/include/systools/win32/qswin32.h
similarity index 100%
rename from sal/inc/systools/win32/qswin32.h
rename to include/systools/win32/qswin32.h
diff --git a/sal/inc/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h
similarity index 100%
rename from sal/inc/systools/win32/uwinapi.h
rename to include/systools/win32/uwinapi.h
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index fdfbfc6..a8ed0f5 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -38,7 +38,6 @@
 		Library_sal_textenc) \
 	$(if $(filter $(OS),WNT), \
 		Library_uwinapi) \
-	Package_inc \
 	StaticLibrary_salcpprt \
 ))
 
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
deleted file mode 100644
index 98281d1..0000000
--- a/sal/Package_inc.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sal_inc,$(SRCDIR)/sal/inc))
-
-$(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android-bootstrap.h,osl/detail/android-bootstrap.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/ios-bootstrap.h,osl/detail/ios-bootstrap.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/component-mapping.h,osl/detail/component-mapping.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comtools.hxx,systools/win32/comtools.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/qswin32.h,systools/win32/qswin32.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/uwinapi.h,systools/win32/uwinapi.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
index 6cfd005..12d4abf 100644
--- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
+++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
@@ -40,7 +40,7 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-#include "protectorfactory.hxx"
+#include "cppunittester/protectorfactory.hxx"
 
 namespace {
 
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index f05e59d..511da85 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -32,7 +32,7 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-#include "protectorfactory.hxx"
+#include "cppunittester/protectorfactory.hxx"
 
 namespace {
 

-- 
To view, visit https://gerrit.libreoffice.org/3501
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I840c681b7c500640d3983e05e9895f3fa8bb1313
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>

