Bug 926007 - Backout changeset 0887088eee1a (bug 842341) because it's only used to support msys-paths with gnu make on windows, which is an unsupported setup; r=gps
authorMike Hommey <mh+mozilla>
Fri, 11 Oct 2013 17:50:00 -0700
changeset 164511 7c03811dad30e02fa4f0118ff5159246c0c129ef
parent 164510 1954202491f15f673717fef76eecaaee762af9db
child 164512 e061f3176d005ee17a77c7c36f3035006c422494
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs926007, 842341
milestone27.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 926007 - Backout changeset 0887088eee1a (bug 842341) because it's only used to support msys-paths with gnu make on windows, which is an unsupported setup; r=gps
addon-sdk/Makefile.in
addon-sdk/copy_source.py
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -1,16 +1,14 @@
 # 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 $(topsrcdir)/config/config.mk
 
-export PYMAKE = $(.PYMAKE)
-
 libs::
 	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk
 	$(MAKE) -f copy_source.mk libs
 
 include $(topsrcdir)/config/rules.mk
 
 TEST_FILES = \
   source/app-extension \
--- a/addon-sdk/copy_source.py
+++ b/addon-sdk/copy_source.py
@@ -1,38 +1,21 @@
 # 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/.
 
 import os
-import posixpath
 import sys
 
-
-def normpath(path):
-    """Ensure UNIX style paths are used with GNU make on Windows.
-
-    This can be removed once we no longer support GNU make on Windows (bug
-    828317).
-    """
-    if os.environ.get('PYMAKE') or os.name not in ('nt', 'ce'):
-        return path
-
-    if len(path) > 2 and path[1] == ':':
-        path = '/' + path[0] + path[2:]
-
-    return posixpath.normpath(path)
-
-
 if len(sys.argv) != 4:
     print >> sys.stderr, "Usage: copy_source.py " \
                          "<topsrcdir> <source directory> <target directory>"
     sys.exit(1)
 
-topsrcdir = normpath(sys.argv[1])
+topsrcdir = sys.argv[1]
 source_dir = sys.argv[2]
 target_dir = sys.argv[3]
 
 print """
 DEPTH     = ..
 topsrcdir = %(topsrcdir)s
 srcdir    = %(topsrcdir)s/addon-sdk
 VPATH     = %(topsrcdir)s/addon-sdk