Bug 1366607: Use relative paths in ldap mozbuild includes. draft
authorTom Prince <mozilla@hocat.ca>
Wed, 18 Oct 2017 13:29:57 -0600
changeset 22874 697dba22c90124c930c356f2a7bd2e1d9394813c
parent 22873 c6b8fc410a900a22f0d54f5f10934a06ffc8ee6b
push id120
push userbmo:mozilla@hocat.ca
push dateWed, 18 Oct 2017 19:32:09 +0000
bugs1366607
Bug 1366607: Use relative paths in ldap mozbuild includes. mozbuild has a test that it can load all mozbuild files when given an empty configuration. It fails if it has include paths that depend on configuration variables. MozReview-Commit-ID: 5g4J64B2cCN
ldap/c-sdk/libraries/liblber/moz.build
ldap/c-sdk/libraries/libldap/moz.build
ldap/c-sdk/libraries/libldif/moz.build
ldap/c-sdk/libraries/libprldap/moz.build
--- a/ldap/c-sdk/libraries/liblber/moz.build
+++ b/ldap/c-sdk/libraries/liblber/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # 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/.
 
-include('/%s/ldap/ldap-sdk.mozbuild' % CONFIG['commreltopsrcdir'])
+include('../../../ldap-sdk.mozbuild')
 
 Library('lber60')
 
 SOURCES += [
     'bprint.c',
     'decode.c',
     'encode.c',
     'io.c',
--- a/ldap/c-sdk/libraries/libldap/moz.build
+++ b/ldap/c-sdk/libraries/libldap/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # 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/.
 
-include('/%s/ldap/ldap-sdk.mozbuild' % CONFIG['commreltopsrcdir'])
+include('../../../ldap-sdk.mozbuild')
 
 SharedLibrary('ldap60')
 
 SOURCES += [
     'abandon.c',
     'add.c',
     'authzidctrl.c',
     'bind.c',
--- a/ldap/c-sdk/libraries/libldif/moz.build
+++ b/ldap/c-sdk/libraries/libldif/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # 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/.
 
-include('/%s/ldap/ldap-sdk.mozbuild' % CONFIG['commreltopsrcdir'])
+include('../../../ldap-sdk.mozbuild')
 
 SharedLibrary('ldif60')
 
 SOURCES += [
     'line64.c'
 ]
 
 LOCAL_INCLUDES += [
--- a/ldap/c-sdk/libraries/libprldap/moz.build
+++ b/ldap/c-sdk/libraries/libprldap/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # 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/.
 
-include('/%s/ldap/ldap-sdk.mozbuild' % CONFIG['commreltopsrcdir'])
+include('../../../ldap-sdk.mozbuild')
 
 SharedLibrary('prldap60')
 
 SOURCES += [
     'ldappr-dns.c',
     'ldappr-error.c',
     'ldappr-io.c',
     'ldappr-public.c',