From 7546fa21756b3f3e75c0c19b6683ba970c69914e Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Fri, 11 Jan 2002 17:18:01 +0000 Subject: [PATCH] Add exclusion lists to the packager. Not part of the default build. git-svn-id: svn://10.0.0.236/trunk@111942 18797224-902f-48f8-a5cc-f745e15eee43 --- .../package/rpm/SOURCES/mozilla-exclude-list | 1 + .../rpm/SOURCES/mozilla-make-package.pl | 18 +++++++ .../rpm/SOURCES/mozilla-prefs-debug.patch | 53 +++++++++---------- .../rpm/SOURCES/mozilla-psm-exclude-list | 1 + .../package/rpm/SPECS/mozilla-DATE.spec.in | 28 ++++++---- 5 files changed, 62 insertions(+), 39 deletions(-) create mode 100644 mozilla/build/package/rpm/SOURCES/mozilla-exclude-list create mode 100644 mozilla/build/package/rpm/SOURCES/mozilla-psm-exclude-list diff --git a/mozilla/build/package/rpm/SOURCES/mozilla-exclude-list b/mozilla/build/package/rpm/SOURCES/mozilla-exclude-list new file mode 100644 index 00000000000..86055709fad --- /dev/null +++ b/mozilla/build/package/rpm/SOURCES/mozilla-exclude-list @@ -0,0 +1 @@ +bin/mozilla-xremote-client \ No newline at end of file diff --git a/mozilla/build/package/rpm/SOURCES/mozilla-make-package.pl b/mozilla/build/package/rpm/SOURCES/mozilla-make-package.pl index dc81ba39770..8d9f54d1497 100755 --- a/mozilla/build/package/rpm/SOURCES/mozilla-make-package.pl +++ b/mozilla/build/package/rpm/SOURCES/mozilla-make-package.pl @@ -32,6 +32,7 @@ my $srcdir = ""; my $package_name = ""; my $package_file = ""; my $output_file = ""; +my $exclude_file = ""; my $shared_pass; my $retval; @@ -41,6 +42,7 @@ $retval = GetOptions('source=s', \$srcdir, 'package=s', \$package_name, 'package-file=s', \$package_file, 'output-file=s', \$output_file, + 'exclude-file=s', \$exclude_file, 'shared!', \$shared_pass); # make sure that all of the values are specific on the command line @@ -101,6 +103,22 @@ LINE: while () { close PACKAGE_FILE; +# check if we have an exclude file + +if ($exclude_file) { + print "reading exclude file $exclude_file\n"; + + open (EXCLUDE_FILE, $exclude_file) || die("$0: Failed to open exclude file $exclude_file for reading."); + + while () { + chomp; + print "Ignoring $_\n"; + push (@exclude_list, $_); + } + + close EXCLUDE_FILE; +} + # Expand our file list expand_file_list(\@file_list, \@exclude_list, \@final_file_list); diff --git a/mozilla/build/package/rpm/SOURCES/mozilla-prefs-debug.patch b/mozilla/build/package/rpm/SOURCES/mozilla-prefs-debug.patch index 8c1824efb7a..cd9d8ecebcf 100644 --- a/mozilla/build/package/rpm/SOURCES/mozilla-prefs-debug.patch +++ b/mozilla/build/package/rpm/SOURCES/mozilla-prefs-debug.patch @@ -1,30 +1,27 @@ ---- mozilla/xpfe/components/prefwindow/resources/content/preftree.xul.debug Sun Aug 5 15:51:52 2001 -+++ mozilla/xpfe/components/prefwindow/resources/content/preftree.xul Sun Aug 5 15:52:09 2001 -@@ -145,27 +145,6 @@ - - +--- mozilla/xpfe/components/prefwindow/resources/content/preftree.xul.debug Fri Jan 4 14:48:46 2002 ++++ mozilla/xpfe/components/prefwindow/resources/content/preftree.xul Fri Jan 4 14:49:18 2002 +@@ -151,24 +151,6 @@ + + -- -- -- -- -- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - + + + diff --git a/mozilla/build/package/rpm/SOURCES/mozilla-psm-exclude-list b/mozilla/build/package/rpm/SOURCES/mozilla-psm-exclude-list new file mode 100644 index 00000000000..ab5bb9924bb --- /dev/null +++ b/mozilla/build/package/rpm/SOURCES/mozilla-psm-exclude-list @@ -0,0 +1 @@ +bin/libnssckbi.so \ No newline at end of file diff --git a/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in b/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in index 68641bc18fd..105a6c78256 100644 --- a/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in +++ b/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in @@ -17,6 +17,8 @@ Source12: mozilla-mail.desktop Source13: mozilla-mail-icon.gif Source14: mozilla-compose.desktop Source15: mozilla-compose-icon.gif +Source16: mozilla-exclude-list +Source17: mozilla-psm-exclude-list Patch0: mozilla-navigator-overlay-menu.patch Patch1: mozilla-editor-overlay-menu.patch Patch6: mozilla-prefs-debug.patch @@ -184,10 +186,12 @@ BUILD_OFFICIAL=1 make -s %{SOURCE7} --package browser --output-file /tmp/mozilla.list \ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ - --source $RPM_BUILD_DIR/mozilla/dist + --source $RPM_BUILD_DIR/mozilla/dist \ + --exclude-file=%{SOURCE16} %{SOURCE7} --package browser --output-file /tmp/mozilla.list.shared \ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ - --source $RPM_BUILD_DIR/mozilla/dist --shared + --source $RPM_BUILD_DIR/mozilla/dist --shared \ + --exclude-file=%{SOURCE16} /bin/rm -f /tmp/mozilla-mail.list /bin/rm -f /tmp/mozilla-mail.list.shared @@ -204,7 +208,8 @@ BUILD_OFFICIAL=1 make -s /bin/rm -f /tmp/mozilla-psm.package %{SOURCE7} --package psm --output-file /tmp/mozilla-psm.list \ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ - --source $RPM_BUILD_DIR/mozilla/dist + --source $RPM_BUILD_DIR/mozilla/dist \ + --exclude-file=%{SOURCE17} # we don't actually build the shared list since the only one in the # package, libnssckbi.so, needs to be in /usr/lib/mozilla because it's @@ -213,13 +218,15 @@ BUILD_OFFICIAL=1 make -s echo libnssckbi.so >> /tmp/mozilla-psm.list # manually add the nss libraries -echo libnss3.so >> /tmp/mozilla-psm.list.shared -echo libsmime3.so >> /tmp/mozilla-psm.list.shared -echo libssl3.so >> /tmp/mozilla-psm.list.shared +# I'll add these back in later when they are actual shared libraries +#echo libnss3.so >> /tmp/mozilla-psm.list.shared +#echo libsmime3.so >> /tmp/mozilla-psm.list.shared +#echo libssl3.so >> /tmp/mozilla-psm.list.shared -#%{SOURCE7} --package psm --output-file /tmp/mozilla-psm.list.shared \ -# --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ -# --source $RPM_BUILD_DIR/mozilla/dist --shared +%{SOURCE7} --package psm --output-file /tmp/mozilla-psm.list.shared \ + --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ + --source $RPM_BUILD_DIR/mozilla/dist --shared \ + --exclude-file=%{SOURCE17} /bin/rm -f /tmp/mozilla-chat.list /bin/rm -f /tmp/mozilla-chat.list.shared @@ -293,10 +300,9 @@ popd $RPM_BUILD_ROOT/%{prefix}/lib/mozilla \ $RPM_BUILD_DIR/mozilla/dist/bin \ %{prefix}/lib/mozilla -# note that this pulls from dist/lib, not dist/bin to get the psm libraries! %{SOURCE8} /tmp/mozilla-psm.list.shared /tmp/mozilla-psm.package \ $RPM_BUILD_ROOT/%{prefix}/lib \ - $RPM_BUILD_DIR/mozilla/dist/lib \ + $RPM_BUILD_DIR/mozilla/dist/bin \ %{prefix}/lib %{SOURCE8} /tmp/mozilla-chat.list /tmp/mozilla-chat.package \