Bug 649033 - Remove unused files in mobile/app/macbuild/ that originated from the desktop equivalent; r=mark.finkle
authorEd Morley <bmo@edmorley.co.uk>
Sun, 17 Jul 2011 12:07:42 +0200
changeset 73705 de00c2c0f208723a6d8ada6c3997159e93b974a9
parent 73704 30b96322b425618f3ab42a3f5c529f6fe927f498
child 73706 1627d7efe03538f5cfc848f2cd62fad614d649af
push id235
push userbzbarsky@mozilla.com
push dateTue, 27 Sep 2011 17:13:04 +0000
treeherdermozilla-beta@2d1e082d176a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmark.finkle
bugs649033
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 649033 - Remove unused files in mobile/app/macbuild/ that originated from the desktop equivalent; r=mark.finkle
mobile/app/Makefile.in
mobile/app/macbuild/Contents/CVS/Entries
mobile/app/macbuild/Contents/CVS/Repository
mobile/app/macbuild/Contents/CVS/Root
mobile/app/macbuild/Contents/Resources/CVS/Entries
mobile/app/macbuild/Contents/Resources/CVS/Repository
mobile/app/macbuild/Contents/Resources/CVS/Root
mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Entries
mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Repository
mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Root
mobile/app/macbuild/background.png
mobile/app/macbuild/disk.icns
mobile/app/macbuild/document.icns
mobile/app/macbuild/dsstore
mobile/app/macbuild/fennec.icns
mobile/app/macbuild/license.r
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@@ -145,19 +145,19 @@ clean clobber repackage::
 ifdef LIBXUL_SDK
 APPFILES = Resources
 else
 APPFILES = MacOS
 endif
 
 libs repackage:: application.ini
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
-	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
+	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
-	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
+	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
 	sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%APP_BINARY%/$(APP_BINARY)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
 	sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
 	$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
 ifdef LIBXUL_SDK
 	cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY)
 	rsync -a --exclude nsinstall --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
 else
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-D/Resources////
-/Info.plist.in/1.18/Tue Feb 19 05:11:34 2008//
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/CVS/Repository
+++ /dev/null
@@ -1,1 +0,0 @@
-mozilla/browser/app/macbuild/Contents
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/CVS/Root
+++ /dev/null
@@ -1,1 +0,0 @@
-:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/CVS/Entries
+++ /dev/null
@@ -1,1 +0,0 @@
-D/English.lproj////
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/CVS/Repository
+++ /dev/null
@@ -1,1 +0,0 @@
-mozilla/browser/app/macbuild/Contents/Resources
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/CVS/Root
+++ /dev/null
@@ -1,1 +0,0 @@
-:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-/InfoPlist.strings.in/1.4/Wed Jan  2 19:06:47 2008//
-D
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Repository
+++ /dev/null
@@ -1,1 +0,0 @@
-mozilla/browser/app/macbuild/Contents/Resources/English.lproj
deleted file mode 100644
--- a/mobile/app/macbuild/Contents/Resources/English.lproj/CVS/Root
+++ /dev/null
@@ -1,1 +0,0 @@
-:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
deleted file mode 100644
index e52f31d051010215470ae91fc84a6d29d8645efa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e97e490585226e69da9cfff20b3b4db2384d963e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f5af7a70fc77eec683544b9b1d7c18c05656e499..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 00b8f9a30536028b4380cc3915b48c2cc1eb47d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 17263f5b2dd0348616205d77894573bc27433008..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/app/macbuild/license.r
+++ /dev/null
@@ -1,117 +0,0 @@
-// See /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/Script.h for language IDs.
-data 'LPic' (5000) {
-  // Default language ID, 0 = English
-  $"0000"
-  // Number of entries in list
-  $"0001"
-
-  // Entry 1
-  // Language ID, 0 = English
-  $"0000"
-  // Resource ID, 0 = STR#/TEXT/styl 5000
-  $"0000"
-  // Multibyte language, 0 = no
-  $"0000"
-};
-
-resource 'STR#' (5000, "English") {
-  {
-    // Language (unused?) = English
-    "English",
-    // Accept (Agree)
-    "Accept",
-    // Decline (Disagree)
-    "Decline",
-    // Print, ellipsis is 0xC9
-    "Print…",
-    // Save As, ellipsis is 0xC9
-    "Save As…",
-    // Descriptive text, curly quotes are 0xD2 and 0xD3
-    "You are about to install\n"
-    "Minefield.\n"
-    "\n"
-    "Please read the license agreement.  If you agree to its terms and accept, click “Accept” to access the software.  Otherwise, click “Decline” to cancel."
-  };
-};
-
-// Beware of 1024(?) byte (character?) line length limitation.  Split up long
-// lines.
-// If straight quotes are used ("), remember to escape them (\").
-// Newline is \n, to leave a blank line, use two of them.
-// 0xD2 and 0xD3 are curly double-quotes ("), 0xD4 and 0xD5 are curly
-//   single quotes ('), 0xD5 is also the apostrophe.
-data 'TEXT' (5000, "English") {
-  "MINEFIELD END-USER SOFTWARE LICENSE AGREEMENT\n"
-  "Version 3.0, May 2008\n"
-  "\n"
-  "A SOURCE CODE VERSION OF CERTAIN MINEFIELD BROWSER FUNCTIONALITY THAT YOU MAY USE, MODIFY AND DISTRIBUTE IS AVAILABLE TO YOU FREE-OF-CHARGE FROM WWW.MOZILLA.ORG UNDER THE MOZILLA PUBLIC LICENSE and other open source software licenses.\n"
-  "\n"
-  "The accompanying executable code version of Minefield and related documentation (the “Product”) is made available to you under the terms of this MINEFIELD END-USER SOFTWARE LICENSE AGREEMENT (THE “AGREEMENT”).  BY CLICKING THE “ACCEPT” BUTTON, OR BY INSTALLING OR USING THE MINEFIELD BROWSER, YOU ARE CONSENTING TO BE BOUND BY THE AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT CLICK THE “ACCEPT” BUTTON, AND DO NOT INSTALL OR USE ANY PART OF THE MINEFIELD BROWSER.\n"
-  "\n"
-  "DURING THE MINEFIELD INSTALLATION PROCESS, AND AT LATER TIMES, YOU MAY BE GIVEN THE OPTION OF INSTALLING ADDITIONAL COMPONENTS FROM THIRD-PARTY SOFTWARE PROVIDERS.  THE INSTALLATION AND USE OF THOSE THIRD-PARTY COMPONENTS MAY BE GOVERNED BY ADDITIONAL LICENSE AGREEMENTS.\n"
-  "\n"
-  "1.  LICENSE GRANT.  The Mozilla Corporation grants you a non-exclusive license to use the executable code version of the Product.  This Agreement will also govern any software upgrades provided by Mozilla that replace and/or supplement the original Product, unless such upgrades are accompanied by a separate license, in which case the terms of that license will govern.\n"
-  "\n"
-  "2.  TERMINATION.  If you breach this Agreement your right to use the Product will terminate immediately and without notice, but all provisions of this Agreement except the License Grant (Paragraph 1) will survive termination and continue in effect.  Upon termination, you must destroy all copies of the Product.\n"
-  "\n"
-  "3.  PROPRIETARY RIGHTS.  Portions of the Product are available in source code form under the terms of the Mozilla Public License and other open source licenses (collectively, “Open Source Licenses”) at http://www.mozilla.org/MPL.  Nothing in this Agreement will be construed to limit any rights granted under the Open Source Licenses.  Subject to the foregoing, Mozilla, for itself and on behalf of its licensors, hereby reserves all intellectual property rights in the Product, except for the rights expressly granted in this Agreement.  You may not remove or alter any trademark, logo, copyright or other proprietary notice in or on the Product.  This license does not grant you any right to use the trademarks, service marks or logos of Mozilla or its licensors.\n"
-  "\n"
-  "4.  PRIVACY POLICY.  You agree to the Mozilla Firefox Privacy Policy, made available online at http://www.mozilla.com/legal/privacy/, as that policy may be changed from time to time.  When Mozilla changes the policy in a material way a notice will be posted on the website at www.mozilla.com and when any change is made in the privacy policy, the updated policy will be posted at the above link.  It is your responsibility to ensure that you understand the terms of the privacy policy, so you should periodically check the current version of the policy for changes.\n"
-  "\n"
-  "5.  WEBSITE INFORMATION SERVICES.  Mozilla and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information.  However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified, and some safe sites may be identified in error.\n"
-  "\n"
-  "6.  DISCLAIMER OF WARRANTY.  THE PRODUCT IS PROVIDED “AS IS” WITH ALL FAULTS.  TO THE EXTENT PERMITTED BY LAW, MOZILLA AND MOZILLA’S DISTRIBUTORS, AND LICENSORS HEREBY DISCLAIM ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES THAT THE PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE AND NON-INFRINGING.  YOU BEAR THE ENTIRE RISK AS TO SELECTING THE PRODUCT FOR YOUR PURPOSES AND AS TO THE QUALITY AND PERFORMANCE OF THE PRODUCT.  THIS LIMITATION WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF IMPLIED WARRANTIES, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.\n"
-  "\n"
-  "7.  LIMITATION OF LIABILITY.  EXCEPT AS REQUIRED BY LAW, MOZILLA AND ITS DISTRIBUTORS, DIRECTORS, LICENSORS, CONTRIBUTORS AND AGENTS (COLLECTIVELY, THE “MOZILLA GROUP”) WILL NOT BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES ARISING OUT OF OR IN ANY WAY RELATING TO THIS AGREEMENT OR THE USE OF OR INABILITY TO USE THE PRODUCT, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOST PROFITS, LOSS OF DATA, AND COMPUTER FAILURE OR MALFUNCTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF THE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH SUCH CLAIM IS BASED.  THE MOZILLA GROUP’S COLLECTIVE LIABILITY UNDER THIS AGREEMENT WILL NOT EXCEED THE GREATER OF $500 (FIVE HUNDRED DOLLARS) AND THE FEES PAID BY YOU UNDER THE LICENSE (IF ANY).  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL, CONSEQUENTIAL OR SPECIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.\n"
-  "\n"
-  "8.  EXPORT CONTROLS.  This license is subject to all applicable export restrictions.  You must comply with all export and import laws and restrictions and regulations of any United States or foreign agency or authority relating to the Product and its use.\n"
-  "\n"
-  "9.  U.S. GOVERNMENT END-USERS.  This Product is a “commercial item,” as that term is defined in 48 C.F.R. 2.101, consisting of “commercial computer software” and “commercial computer software documentation,” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995) and 48 C.F.R. 227.7202 (June 1995).  Consistent with 48 C.F.R. 12.212, 48 C.F.R. 27.405(b)(2) (June 1998) and 48 C.F.R. 227.7202, all U.S. Government End Users acquire the Product with only those rights as set forth therein.\n"
-  "\n"
-  "10.  MISCELLANEOUS.  (a) This Agreement constitutes the entire agreement between Mozilla and you concerning the subject matter hereof, and it may only be modified by a written amendment signed by an authorized executive of Mozilla.  (b) Except to the extent applicable law, if any, provides otherwise, this Agreement will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions.  (c) This Agreement will not be governed by the United Nations Convention on Contracts for the International Sale of Goods.  "
-  "(d) If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect.  (e) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. (f) Except as required by law, the controlling language of this Agreement is English.  "
-  "(g) You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms; the Mozilla Corporation may assign its rights under this Agreement without condition.  (h) This Agreement will be binding upon and inure to the benefit of the parties, their successors and permitted assigns."
-};
-
-data 'styl' (5000, "English") {
-  // Number of styles following = 2
-  $"0002"
-
-  // Style 1.  This is used to display the header lines in bold text.
-  // Start character = 0
-  $"0000 0000"
-  // Height = 16
-  $"0010"
-  // Ascent = 12
-  $"000C"
-  // Font family = 1024 (Lucida Grande)
-  $"0400"
-  // Style bitfield, 0x1=bold 0x2=italic 0x4=underline 0x8=outline
-  // 0x10=shadow 0x20=condensed 0x40=extended
-  $"01"
-  // Style, unused?
-  $"02"
-  // Size = 12 point
-  $"000C"
-  // Color, RGB
-  $"0000 0000 0000"
-
-  // Style 2.  This is used to display the body.
-  // Start character = 68
-  $"0000 0044"
-  // Height = 16
-  $"0010"
-  // Ascent = 12
-  $"000C"
-  // Font family = 1024 (Lucida Grande)
-  $"0400"
-  // Style bitfield, 0x1=bold 0x2=italic 0x4=underline 0x8=outline
-  // 0x10=shadow 0x20=condensed 0x40=extended
-  $"00"
-  // Style, unused?
-  $"02"
-  // Size = 12 point
-  $"000C"
-  // Color, RGB
-  $"0000 0000 0000"
-};