Added an ssl assignment to signify that a project uses ssl

13 files changed, 40 insertions, 6 deletions

diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README
index b80261161cf..436cad0be21 100644
--- a/bin/MakeProjectCreator/README
+++ b/bin/MakeProjectCreator/README
@@ -42,6 +42,7 @@ idlflags	Specifies the idl flags to be used when processing idl files
 idlpreprocessor	Simple assignment used in the gnu template only
 pch_header	Specifies the precompiled header file name
 pch_source	Specifies the precompiled source file name
+ssl             Specifies that the project will use ssl
 tao		Specifies that the project will use TAO
 
 libpaths	Specifies 1 or more locations to find libraries
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index f5ff5f42a7e..389a360d986 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -45,6 +45,7 @@ my(%validNames) = ('exename'         => 1,
                    'libs'            => 1,
                    'pch_header'      => 1,
                    'pch_source'      => 1,
+                   'ssl'             => 1,
                    'tao'             => 1,
                    'dllout'          => 1,
                    'libout'          => 1,
@@ -590,6 +591,21 @@ sub is_special_tag {
 }
 
 
+sub escape_regex_special {
+  my($self) = shift;
+  my($name) = shift;
+
+  $name =~ s/\\/\\\\/g;
+  $name =~ s/\$/\\\$/g;
+  $name =~ s/\[/\\\[/g;
+  $name =~ s/\]/\\\]/g;
+  $name =~ s/\(/\\\(/g;
+  $name =~ s/\)/\\\)/g;
+
+  return $name;
+}
+
+
 sub sift_files {
   my($self)  = shift;
   my($files) = shift;
@@ -631,8 +647,10 @@ sub sift_files {
 
   ## Now deal with the saved files
   if (defined $saved[0]) {
-    my($pjname) = $self->get_assignment('project_name');
-    foreach my $file (@saved) {
+    my($pjname) = $self->escape_regex_special(
+                           $self->get_assignment('project_name'));
+    foreach my $save (@saved) {
+      my($file) = $self->escape_regex_special($save);
       if ($pjname =~ /$file/ || $file =~ /$pjname/) {
         push(@$array, $file);
       }
@@ -733,7 +751,8 @@ sub generated_source_listed {
       foreach my $val (@$array) {
         foreach my $ext (@gen) {
           foreach my $i (@$idl) {
-            if ($val =~ /$i$ext$/) {
+            my($ifile) = $self->escape_regex_special($i);
+            if ($val =~ /$ifile$ext$/) {
               push(@found, $val);
             }
           }
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index c4bd12b530d..d0627d425ff 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -83,13 +83,18 @@ endif
 <%if(libpaths)%>
 LDFLAGS      +=<%foreach(libpaths)%> -L<%libpath%><%endfor%>
 <%endif%>
+<%if(idl_files)%>
 <%if(idlflags)%>
 TAO_IDLFLAGS += <%idlflags%>
 <%endif%>
+<%endif%>
 <%if(libs)%>
 
 <%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> =<%foreach(libs)%> -l<%lib%><%endfor%>
 <%endif%>
+<%if(ssl)%>
+<%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
+<%endif%>
 
 #----------------------------------------------------------------------------
 #       Local targets
diff --git a/bin/MakeProjectCreator/templates/gnudll.mpt b/bin/MakeProjectCreator/templates/gnudll.mpt
new file mode 100644
index 00000000000..a1f16f6e6e8
--- /dev/null
+++ b/bin/MakeProjectCreator/templates/gnudll.mpt
@@ -0,0 +1 @@
+ssl_libs = ssl crypto
diff --git a/bin/MakeProjectCreator/templates/gnuexe.mpt b/bin/MakeProjectCreator/templates/gnuexe.mpt
new file mode 100644
index 00000000000..a1f16f6e6e8
--- /dev/null
+++ b/bin/MakeProjectCreator/templates/gnuexe.mpt
@@ -0,0 +1 @@
+ssl_libs = ssl crypto
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index 953055dfad9..b2ee46b34b5 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -122,7 +122,7 @@ BSC32_SBRS= \
 	
 <%if(type_is_binary)%>
 LINK32=link.exe
-LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
+LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%>/INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
 <%endif%>
 <%if(type_is_static)%>
 LINK32=link.exe -lib
diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt
index 3b99b378a92..f40a4cf5c52 100644
--- a/bin/MakeProjectCreator/templates/nmakedll.mpt
+++ b/bin/MakeProjectCreator/templates/nmakedll.mpt
@@ -13,6 +13,7 @@ Release {
   debug_switch          =
   type_is_dynamic       = 1
   type_is_binary        = 1
+  ssl_libs              = libeay32 ssleay32
 }
 
 Debug {
@@ -26,6 +27,7 @@ Debug {
   type_is_dynamic       = 1
   type_is_binary        = 1
   pdb                   = 1
+  ssl_libs              = libeay32 ssleay32
 }
 
 Static Release {
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index 70bda1c8e62..931e813f0b5 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -14,6 +14,7 @@ Release {
   output_dir            = Release
   intermediate_dir      = Release
   debug_switch          =
+  ssl_libs              = libeay32 ssleay32
 }
 
 Debug {
@@ -24,7 +25,7 @@ Debug {
   intermediate_dir      = Debug
   lib_modifier          = d
   pdb                   = 1
-
+  ssl_libs              = libeay32 ssleay32
 }
 
 Static Release {
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index e3ce43270d1..3e999f9f61f 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -61,7 +61,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%><%if(sharedname)%>/pdb:<%sharedname%><%lib_modifier%>.pdb <%endif%><%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%><%if(sharedname)%>/pdb:<%sharedname%><%lib_modifier%>.pdb <%endif%><%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/vc6dspdll.mpt b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
index 3c7cb28e835..965ce8a4534 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdll.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
@@ -3,6 +3,7 @@ type_is_binary  = 1
 type_is_dynamic = 1
 common_defines  = WIN32 _WINDOWS
 pch_defines     = ACE_USING_PCH
+ssl_libs        = libeay32 ssleay32
 
 Release {
   use_debug_libraries   = 0
diff --git a/bin/MakeProjectCreator/templates/vc6dspexe.mpt b/bin/MakeProjectCreator/templates/vc6dspexe.mpt
index d1da403c1ba..8785d7a896b 100644
--- a/bin/MakeProjectCreator/templates/vc6dspexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspexe.mpt
@@ -5,6 +5,7 @@ type_is_binary   = 1
 common_defines   = WIN32 _CONSOLE
 subsystem        = console
 pch_defines      = ACE_USING_PCH
+ssl_libs         = libeay32 ssleay32
 
 Release {
   use_debug_libraries   = 0
diff --git a/bin/MakeProjectCreator/templates/vc7dll.mpt b/bin/MakeProjectCreator/templates/vc7dll.mpt
index df8569044ec..21c4cadfaba 100644
--- a/bin/MakeProjectCreator/templates/vc7dll.mpt
+++ b/bin/MakeProjectCreator/templates/vc7dll.mpt
@@ -2,6 +2,7 @@ configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
 pdb                = 1
 pch_defines        = ACE_USING_PCH
+ssl_libs           = libeay32 ssleay32
 
 Release {
   type_is_dynamic  = 1
diff --git a/bin/MakeProjectCreator/templates/vc7exe.mpt b/bin/MakeProjectCreator/templates/vc7exe.mpt
index db6548c369a..a8d4ac3d4d4 100644
--- a/bin/MakeProjectCreator/templates/vc7exe.mpt
+++ b/bin/MakeProjectCreator/templates/vc7exe.mpt
@@ -5,6 +5,7 @@ pch_defines        = ACE_USING_PCH
 configuration_type = 1
 subsystem          = 1
 pdb                = 1
+ssl_libs           = libeay32 ssleay32
 
 Release {
   defines          = NDEBUG