From f01792dda15fe4509a2925929f4d58daef9d15c0 Mon Sep 17 00:00:00 2001
From: Andrzej Hunt <andrzej.hunt@collabora.com>
Date: Wed, 19 Mar 2014 07:45:36 +0000
Subject: scp2: move firebird into base.

Change-Id: I35f9b2dcb821bda0ea97de12a8ae8d27915f6b3e
---
 scp2/source/base/firebird.scp            | 41 ++++++++++++++++++++++++++++++++
 scp2/source/firebird/file_firebird.scp   | 30 -----------------------
 scp2/source/firebird/module_firebird.scp | 34 --------------------------
 3 files changed, 41 insertions(+), 64 deletions(-)
 create mode 100644 scp2/source/base/firebird.scp
 delete mode 100644 scp2/source/firebird/file_firebird.scp
 delete mode 100644 scp2/source/firebird/module_firebird.scp

(limited to 'scp2/source')

diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp
new file mode 100644
index 000000000000..dd7288f38ea1
--- /dev/null
+++ b/scp2/source/base/firebird.scp
@@ -0,0 +1,41 @@
+/*
+ * 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 .
+ */
+
+#include "macros.inc"
+
+#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
+
+Module gid_Module_Optional_Firebird
+    Name = "Firebird";
+    Description = "Firebird embedded database";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Root_Brand;
+    Files = (
+        File gid_File_Firebird
+    );
+    Styles = (HIDDEN_ROOT);
+End
+
+File gid_File_Firebird
+    TXT_FILE_BODY;
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "firebird.filelist";
+End
+
+#endif
diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp
deleted file mode 100644
index cbdd232f67d5..000000000000
--- a/scp2/source/firebird/file_firebird.scp
+++ /dev/null
@@ -1,30 +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 .
- */
-
-#include "macros.inc"
-
-#ifndef SYSTEM_FIREBIRD
-
-File gid_File_Firebird
-    TXT_FILE_BODY;
-    Styles = (FILELIST, PACKED);
-    Dir = FILELIST_DIR;
-    Name = "firebird.filelist";
-End
-
-#endif
diff --git a/scp2/source/firebird/module_firebird.scp b/scp2/source/firebird/module_firebird.scp
deleted file mode 100644
index 8e6c7d79aaaa..000000000000
--- a/scp2/source/firebird/module_firebird.scp
+++ /dev/null
@@ -1,34 +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 .
- */
-
-#include "macros.inc"
-
-#ifndef SYSTEM_FIREBIRD
-
-Module gid_Module_Firebird
-    Name = "Firebird";
-    Description = "Firebird";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root_Brand;
-    Files = (
-        File gid_File_Firebird
-    );
-    Styles = (HIDDEN_ROOT);
-End
-
-#endif
-- 
cgit