summaryrefslogtreecommitdiff
path: root/scp2/source/quickstart
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-10-30 22:57:06 +0100
committerMichael Stahl <mstahl@redhat.com>2014-10-31 17:53:52 +0100
commitf049b83cc2947efbe7382f23e12fc91fe50a589d (patch)
treebd6ed04eedb2544fd60c7641d0af28f860506977 /scp2/source/quickstart
parent58735f060804248089c0919c67485ae78c462c36 (diff)
scp2: move WNT executables to AutoInstall
Change-Id: I3e541053faf956dc0cd2a3f068cd93b73fcaab6d
Diffstat (limited to 'scp2/source/quickstart')
-rw-r--r--scp2/source/quickstart/file_quickstart.scp26
-rw-r--r--scp2/source/quickstart/module_quickstart.scp4
2 files changed, 3 insertions, 27 deletions
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
deleted file mode 100644
index 51e2d8bec4bc..000000000000
--- a/scp2/source/quickstart/file_quickstart.scp
+++ /dev/null
@@ -1,26 +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"
-
-File gid_File_Exe_Quickstart
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
- Name = "quickstart.exe";
-End
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
index 62407d8606f3..108052691e83 100644
--- a/scp2/source/quickstart/module_quickstart.scp
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -18,10 +18,12 @@
#include "macros.inc"
+#include "AutoInstall/quickstart"
+
Module gid_Module_Optional_Quickstart
MOD_NAME_DESC ( MODULE_OPTIONAL_QUICKSTART );
Sortkey = "1400";
Default = YES;
ParentID = gid_Module_Optional;
- Files = (gid_File_Exe_Quickstart, gid_File_Tmp_Userinstall_Quickstart_Inf);
+ Files = (auto_quickstart_ALL, gid_File_Tmp_Userinstall_Quickstart_Inf);
End