diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-01 09:45:41 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-01 09:45:41 -0230 |
| commit | b36feedb5cc6d7b06723a6781c94e2571d58cc01 (patch) | |
| tree | 2fd3f605b1bee409a74a0b3c750b0fe2bbe1fdd6 | |
| parent | align config files with C# (diff) | |
| download | ice-b36feedb5cc6d7b06723a6781c94e2571d58cc01.tar.bz2 ice-b36feedb5cc6d7b06723a6781c94e2571d58cc01.tar.xz ice-b36feedb5cc6d7b06723a6781c94e2571d58cc01.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2342 - warn about invalid CPP_COMPILER setting
| -rw-r--r-- | cpp/config/Make.rules.mak | 7 | ||||
| -rwxr-xr-x | cpp/fixCopyright.py | 2 | ||||
| -rwxr-xr-x | cppe/config/Make.rules.mak | 4 | ||||
| -rw-r--r-- | py/config/Make.rules.mak | 5 | ||||
| -rw-r--r-- | rb/config/Make.rules.mak | 4 |
5 files changed, 19 insertions, 3 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 60f8acfedc6..e4be229751e 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -104,8 +104,11 @@ SETARGV = setargv.obj !if "$(CPP_COMPILER)" == "BCC2006" !include $(top_srcdir)/config/Make.rules.bcc -!else -!include $(top_srcdir)/config/Make.rules.msvc +!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \ + "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" +!include $(top_srcdir)/config/Make.rules.msvc +! else +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) !endif install_libdir = $(prefix)\lib diff --git a/cpp/fixCopyright.py b/cpp/fixCopyright.py index 4feb798c8a4..0399e937a29 100755 --- a/cpp/fixCopyright.py +++ b/cpp/fixCopyright.py @@ -215,7 +215,7 @@ for x in sys.argv[1:]: sys.exit(0) elif x == "-e": patchIceE = True - path = "../icee" + path = "../cppe" elif x.startswith("-"): print sys.argv[0] + ": unknown option `" + x + "'" print diff --git a/cppe/config/Make.rules.mak b/cppe/config/Make.rules.mak index 8197a7299a0..507c0b17605 100755 --- a/cppe/config/Make.rules.mak +++ b/cppe/config/Make.rules.mak @@ -92,6 +92,10 @@ OBJEXT = .obj # # Verify valid embedded settings # +!if "$(CPP_COMPILER)" != "VC80" && "$(CPP_COMPILER)" != "VC80_EXPRESS" +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) +!endif + !if "$(EMBEDDED_DEVICE)" != "" !if "$(EMBEDDED_DEVICE)" != "PocketPC" && "$(EMBEDDED_DEVICE)" != "Smartphone" !error Invalid setting for EMBEDDED_DEVICE: "$(EMBEDDED_DEVICE)" diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak index 3c8c7303f88..457b4f2f1aa 100644 --- a/py/config/Make.rules.mak +++ b/py/config/Make.rules.mak @@ -76,6 +76,11 @@ install_pythondir = $(prefix)\python THIRDPARTY_HOME = $(STLPORT_HOME) +!if "$(CPP_COMPILER)" != "VC60" && "$(CPP_COMPILER)" != "VC71" && \ + "$(CPP_COMPILER)" != "VC80" && "$(CPP_COMPILER)" != "VC80_EXPRESS" +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) +!endif + !if exist ($(top_srcdir)\config\Make.rules.msvc) !include $(top_srcdir)\config\Make.rules.msvc !else diff --git a/rb/config/Make.rules.mak b/rb/config/Make.rules.mak index 5a75a1cfd7b..e2a06980eb0 100644 --- a/rb/config/Make.rules.mak +++ b/rb/config/Make.rules.mak @@ -60,6 +60,10 @@ install_rubydir = $(prefix)\ruby THIRDPARTY_HOME = $(STLPORT_HOME) +!if "$(CPP_COMPILER)" != "VC60" +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) +!endif + !if exist ($(top_srcdir)\config\Make.rules.msvc) !include $(top_srcdir)\config\Make.rules.msvc !else |