Browse Source

Fixes for gitlab builds

Frank-Rainer Grahl 4 years ago
parent
commit
e38a2f7b67

+ 81 - 0
LICENSE

@@ -0,0 +1,81 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Parent  fcfb74a4d79ecaba4b5b11e378f3d2a6bdf9efac
+Bug 1602257 - part 2: Change syntax for  gitignore form hg to git. r=IanN a=IanN
+
+diff --git a/.gitignore b/.gitignore
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,42 +1,45 @@
+-# .hgignore - List of filenames hg should ignore
++# .gitignore - List of filenames git should ignore
+ 
+ # Filenames that should be ignored wherever they appear
+-~$
+-\.pyc$
+-(^|/)TAGS$
+-(^|/)\.DS_Store$
++*~
++*.pyc
++*.pyo
++TAGS
++tags
++ID
++.DS_Store*
++*.pdb
++
++# Vim swap files.
++.*.sw[a-z]
++
++# Emacs directory variable files.
++**/.dir-locals.el
+ 
+ # User files that may appear at the root
+-^\.mozconfig$
+-^mozconfig$
+-^\.mozconfig\.mk$
+-^\.mozconfig\.out$
+-^configure$
+-^config\.cache$
+-^config\.log$
+-^ID$
++/.mozconfig*
++/mozconfig
++/configure
++/old-configure
++/config.cache
++/config.log
++/.clang_complete
++/machrc
++/.machrc
+ 
+ #treestate
+-^.treestate$
++.treestate
+ 
+ # Build directories
+-^obj-
+-^objdir-
++/obj*/
+ 
+ # directories we check out from other repositories
+-^directory/c-sdk$
+-# ^mozilla$ <--- causes regex perf issues when present with fsmonitor. See Bug 1293993.
+ mozilla
+ 
+-^.mozilla-trunk$
+-
+ # SVN directories
+-\.svn/
+-
+-# Git repositories
+-.git/
++/.svn/
+ 
+ # Ignore the files and directory that Eclipse IDE creates
+-\.project$
+-\.cproject$
+-\.settings/
++.project
++.cproject
++.settings/

+ 1 - 0
comm-release/patches/series

@@ -1,4 +1,5 @@
 1602257-gitlab.patch
+1602257-2-gitlab.patch
 1583369-buildcore-253.patch
 1354809-nsMsgGroupView-validIndex2.patch
 1379369-3-browserdraganddrop.patch

+ 0 - 1
mozilla-release/patches/1521463-66a1.patch

@@ -1,4 +1,3 @@
-
 # HG changeset patch
 # User Chris Manchester <cmanchester@mozilla.com>
 # Date 1548274514 0

+ 30 - 0
mozilla-release/patches/1605729-buildconfig-gitlab.patch

@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs@blueyonder.co.uk>
+# Parent  e8ad4683e96ad5c142ce1cc44b9cc05638baad80
+Bug 1605729 - Extend variables.py to understand gitlab repos. r=frg a=frg
+
+diff --git a/build/variables.py b/build/variables.py
+--- a/build/variables.py
++++ b/build/variables.py
+@@ -85,17 +85,20 @@ def source_repo_header(output):
+         if not changeset:
+             raise Exception('could not resolve changeset; '
+                             'try setting MOZ_SOURCE_CHANGESET')
+ 
+     if changeset:
+         output.write('#define MOZ_SOURCE_STAMP %s\n' % changeset)
+ 
+     if repo and buildconfig.substs.get('MOZ_INCLUDE_SOURCE_INFO'):
+-        source = '%s/rev/%s' % (repo, changeset)
++        if "gitlab" in repo:
++            source = '%s/tree/%s' % (repo, changeset)
++        else:
++            source = '%s/rev/%s' % (repo, changeset)
+         output.write('#define MOZ_SOURCE_REPO %s\n' % repo)
+         output.write('#define MOZ_SOURCE_URL %s\n' % source)
+ 
+ 
+ def main(args):
+     if (len(args)):
+         func = globals().get(args[0])
+         if func:

+ 1 - 0
mozilla-release/patches/series

@@ -2422,6 +2422,7 @@ PPPPPPP-version.patch
 1430315-59a1.patch
 1429056-59a1.patch
 1521463-66a1.patch
+1605729-buildconfig-gitlab.patch
 TOP-1580697-rust137_servo_webrender-56.patch
 TOP-1602256-1-killtelemetry-network.patch
 TOP-1602256-2-killtelemetry-urlclassifier.patch