add some exclusions to .hgignore, fix Makefile to allow for cygwin 'os'.
authoralta88@gmail.com
Tue, 19 Jan 2010 09:57:32 -0700
changeset 1039 ea7e050cb26cd00b2db512f4608d0206b0fb1d63
parent 1038 2650d853bdc217b3a2089fadaca4f6e022fdf29f
child 1040 b5a98c3b4396f344aa0121b2a6d009487211c024
push id178
push usermyk@mozilla.com
push dateMon, 25 Jan 2010 20:39:38 +0000
add some exclusions to .hgignore, fix Makefile to allow for cygwin 'os'.
.hgignore
Makefile
test/harness/Makefile
test/unit/Makefile
--- a/.hgignore
+++ b/.hgignore
@@ -6,16 +6,24 @@
 
 # JARs and XPIs
 \.jar$
 \.xpi$
 
 # ActiveState Komodo project file
 \.kpf$
 
+# Eclipse files
+\.externalToolBuilders$
+\.project$
+
 # the local mirror of the web distribution directory, for developers
 # who distribute their builds via the website
 ^dist$
 
 # files generated by the test harness
 ^test/harness/app/update.test$
 ^test/profile$
 ^test/unit/test_.*\.log$
+
+# generic utility dir
+syntax: regexp
+^archive-bkup$
--- a/Makefile
+++ b/Makefile
@@ -140,21 +140,25 @@ ifeq ($(sys), Linux)
   os = Linux
 else
 ifeq ($(sys), MINGW32_NT-6.0)
   os = WINNT
 else
 ifeq ($(sys), MINGW32_NT-5.1)
   os = WINNT
 else
+ifeq ($(sys), CYGWIN_NT-6.1-WOW64)
+  os = WINNT
+else
   $(error your os is unknown/unsupported: $(sys))
 endif
 endif
 endif
 endif
+endif
 
 # The path to the extension, in the native format, as required by the app
 # for extensions installed via a file in the $(profile)/extensions/ directory
 # that contains the path to the extension (which is how we install it).
 ifeq ($(os), WINNT)
   extension_dir = $(subst /,\,$(shell pwd -W))
 else
   extension_dir = $(shell pwd)
--- a/test/harness/Makefile
+++ b/test/harness/Makefile
@@ -70,21 +70,25 @@ ifeq ($(sys), Linux)
   os = Linux
 else
 ifeq ($(sys), MINGW32_NT-6.0)
   os = WINNT
 else
 ifeq ($(sys), MINGW32_NT-5.1)
   os = WINNT
 else
+ifeq ($(sys), CYGWIN_NT-6.1-WOW64)
+  os = WINNT
+else
   $(error Sorry, your os is unknown/unsupported: $(sys))
 endif
 endif
 endif
 endif
+endif
 
 ifeq ($(topsrcdir),)
 topsrcdir = ../..
 endif
 
 ifeq ($(native_topsrcdir),)
 ifeq ($(os), WINNT)
 native_topsrcdir = ..\..
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -11,21 +11,25 @@ ifeq ($(sys), Linux)
   os = Linux
 else
 ifeq ($(sys), MINGW32_NT-6.0)
   os = WINNT
 else
 ifeq ($(sys), MINGW32_NT-5.1)
   os = WINNT
 else
+ifeq ($(sys), CYGWIN_NT-6.1-WOW64)
+  os = WINNT
+else
   $(error Sorry, your os is unknown/unsupported: $(sys))
 endif
 endif
 endif
 endif
+endif
 
 ifeq ($(topsrcdir),)
 topsrcdir = ../..
 endif
 
 ifeq ($(native_topsrcdir),)
 ifeq ($(os), WINNT)
 native_topsrcdir = ..\..