install webview files using filelist

Change-Id: Ib4501e1171f3940a6909ce4f0c05a669d708b93a

6 files changed, 39 insertions, 227 deletions

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index c2cbc7aca31c..5b946f516578 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -186,16 +186,6 @@ Directory gid_Dir_Share_Config_Wizard
     DosName = "wizard";
 End
 
-Directory gid_Dir_Share_Config_Wizard_Web
-    ParentID = gid_Dir_Share_Config_Wizard;
-    DosName = "web";
-End
-
-Directory gid_Dir_Share_Config_Wizard_Web_Buttons
-    ParentID = gid_Dir_Share_Config_Wizard_Web;
-    DosName = "buttons";
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg
     ParentID = gid_Brand_Dir_Share_Config;
     DosName = "soffice.cfg";
@@ -279,11 +269,6 @@ Directory gid_Dir_Share_Scripts
     DosName = "Scripts";
 End
 
-Directory gid_Dir_Config_Webcast
-    ParentID = gid_Brand_Dir_Share_Config;
-    DosName = "webcast";
-End
-
 Directory gid_Dir_Gallery
     ParentID = gid_Brand_Dir_Share;
     DosName = "gallery";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 96cffcca1a23..a654ecb96522 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,16 +74,11 @@ File gid_File_Extra_Cfgsrv
     Patchfiles = ();
 End
 
-File gid_File_Extra_Common_Inc
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.inc";
-End
-
-File gid_File_Extra_Common_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.pl";
+File gid_File_sd_web
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST, PACKED);
+    Name = "sd_web.filelist";
 End
 
 File gid_File_Extra_Database
@@ -100,51 +95,6 @@ File gid_File_Extra_Databasebiblio
     Name = "extras_databasebiblio.filelist";
 End
 
-File gid_File_Extra_Edit_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.asp";
-End
-
-File gid_File_Extra_Edit_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.pl";
-End
-
-File gid_File_Extra_Editpic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.asp";
-End
-
-File gid_File_Extra_Editpic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.pl";
-End
-
-File gid_File_Extra_Glas_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-blue.zip";
-End
-
-File gid_File_Extra_Glas_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-green.zip";
-End
-
-File gid_File_Extra_Glas_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-red.zip";
-End
-
 #if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
 File gid_File_Extra_Liblangtag
     Dir = FILELIST_DIR;
@@ -154,56 +104,6 @@ File gid_File_Extra_Liblangtag
 End
 #endif
 
-File gid_File_Extra_Round_Gorilla_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "round-gorilla.zip";
-End
-
-File gid_File_Extra_Round_White_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "round-white.zip";
-End
-File gid_File_Extra_Simple_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "simple.zip";
-End
-File gid_File_Extra_Square_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-blue.zip";
-End
-File gid_File_Extra_Square_Gray_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-gray.zip";
-End
-File gid_File_Extra_Square_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-green.zip";
-End
-File gid_File_Extra_Square_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-red.zip";
-End
-File gid_File_Extra_Square_Yellow_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-yellow.zip";
-End
-
 #ifdef UNX
 
 #ifndef WITHOUT_AFMS
@@ -298,12 +198,6 @@ File gid_File_Extra_Gallwwwgraf
     Name = "extras_gallwwwgraf.filelist";
 End
 
-File gid_File_Extra_Index_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "index.pl";
-End
-
 File gid_File_Extra_Palettes
     Dir = FILELIST_DIR;
     USER_FILE_BODY;
@@ -312,42 +206,6 @@ File gid_File_Extra_Palettes
     Patchfiles = ();
 End
 
-File gid_File_Extra_Poll_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.asp";
-End
-
-File gid_File_Extra_Poll_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.pl";
-End
-
-File gid_File_Extra_Savepic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.asp";
-End
-
-File gid_File_Extra_Savepic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.pl";
-End
-
-File gid_File_Extra_Show_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.asp";
-End
-
-File gid_File_Extra_Show_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.pl";
-End
-
 File gid_File_Extra_Tpllayoutimpr
     Dir = FILELIST_DIR;
     TXT_FILE_BODY;
@@ -404,18 +262,6 @@ File gid_File_Extra_Tplwizstyles
     Name = "extras_tplwizstyles.filelist";
 End
 
-File gid_File_Extra_Webcast_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.asp";
-End
-
-File gid_File_Extra_Webcast_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.pl";
-End
-
 File gid_File_Extra_Wordbook
     Dir = gid_Dir_Wordbook;
     PACKED_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7cc26369c95c..0590f9c3f850 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -386,32 +386,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Basic_Tutorials,
 	gid_File_Extra_Cfgsrv,
 	gid_File_Extra_Cfgsrv_Bitmap_Unx,
-	gid_File_Extra_Common_Inc,
-	gid_File_Extra_Common_Pl,
-	gid_File_Extra_Edit_Asp,
-	gid_File_Extra_Edit_Pl,
-	gid_File_Extra_Editpic_Asp,
-	gid_File_Extra_Editpic_Pl,
-	gid_File_Extra_Index_Pl,
-	gid_File_Extra_Poll_Asp,
-	gid_File_Extra_Poll_Pl,
-	gid_File_Extra_Savepic_Asp,
-	gid_File_Extra_Savepic_Pl,
-	gid_File_Extra_Show_Asp,
-	gid_File_Extra_Show_Pl,
-	gid_File_Extra_Webcast_Asp,
-	gid_File_Extra_Webcast_Pl,
-	gid_File_Extra_Square_Yellow_Zip,
-	gid_File_Extra_Square_Red_Zip,
-	gid_File_Extra_Square_Green_Zip,
-	gid_File_Extra_Square_Gray_Zip,
-	gid_File_Extra_Square_Blue_Zip,
-	gid_File_Extra_Simple_Zip,
-	gid_File_Extra_Round_White_Zip,
-	gid_File_Extra_Round_Gorilla_Zip,
-	gid_File_Extra_Glas_Red_Zip,
-	gid_File_Extra_Glas_Green_Zip,
-	gid_File_Extra_Glas_Blue_Zip,
+	gid_File_sd_web,
         gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
         gid_File_Share_Config_Sofficecfg_uiconfig_cui,
 #ifdef DBCONNECTIVITY
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
index 1db0b184118d..d4507ab165fc 100644
--- a/sd/Package_web.mk
+++ b/sd/Package_web.mk
@@ -9,32 +9,38 @@
 
 $(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res))
 
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-blue.zip,buttons/glas-blue.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-green.zip,buttons/glas-green.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-red.zip,buttons/glas-red.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/round-gorilla.zip,buttons/round-gorilla.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/round-white.zip,buttons/round-white.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/simple.zip,buttons/simple.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-blue.zip,buttons/square-blue.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-gray.zip,buttons/square-gray.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-green.zip,buttons/square-green.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-red.zip,buttons/square-red.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-yellow.zip,buttons/square-yellow.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/common.inc,webview/common.inc))
-$(eval $(call gb_Package_add_file,sd_web,pck/common.pl,webview/common.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/edit.asp,webview/edit.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/editpic.asp,webview/editpic.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/editpic.pl,webview/editpic.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/edit.pl,webview/edit.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/index.pl,webview/index.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/poll.asp,webview/poll.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/poll.pl,webview/poll.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/savepic.asp,webview/savepic.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/savepic.pl,webview/savepic.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/show.asp,webview/show.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/show.pl,webview/show.pl))
-# the following two files are really renamed
-$(eval $(call gb_Package_add_file,sd_web,pck/webcast.asp,webview/webview.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/webcast.pl,webview/webview.pl))
+$(eval $(call gb_Package_set_outdir,sd_web,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_web,share/config/webcast,\
+	webview/common.inc \
+	webview/common.pl \
+	webview/edit.asp \
+	webview/editpic.asp \
+	webview/editpic.pl \
+	webview/edit.pl \
+	webview/index.pl \
+	webview/poll.asp \
+	webview/poll.pl \
+	webview/savepic.asp \
+	webview/savepic.pl \
+	webview/show.asp \
+	webview/show.pl \
+	webview/webcast.asp \
+	webview/webcast.pl \
+))
+
+$(eval $(call gb_Package_add_files,sd_web,share/config/wizard/web/buttons,\
+	buttons/glas-blue.zip \
+	buttons/glas-green.zip \
+	buttons/glas-red.zip \
+	buttons/round-gorilla.zip \
+	buttons/round-white.zip \
+	buttons/simple.zip \
+	buttons/square-blue.zip \
+	buttons/square-gray.zip \
+	buttons/square-green.zip \
+	buttons/square-red.zip \
+	buttons/square-yellow.zip \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/res/webview/webview.asp b/sd/res/webview/webcast.asp
index f084fc2dfc33..f084fc2dfc33 100644
--- a/sd/res/webview/webview.asp
+++ b/sd/res/webview/webcast.asp
diff --git a/sd/res/webview/webview.pl b/sd/res/webview/webcast.pl
index dadffe2e988a..dadffe2e988a 100644
--- a/sd/res/webview/webview.pl
+++ b/sd/res/webview/webcast.pl