ChangeLogTag: Wed Oct 6 11:35:48 2004 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 65 insertions, 7 deletions

diff --git a/modules/GHSProjectCreator.pm b/modules/GHSProjectCreator.pm
index 45eaf1bb..38cfa1b1 100644
--- a/modules/GHSProjectCreator.pm
+++ b/modules/GHSProjectCreator.pm
@@ -21,11 +21,23 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
-sub file_sorter {
-  my($self)  = shift;
-  my($left)  = shift;
-  my($right) = shift;
-  return lc($left) cmp lc($right);
+sub compare_output {
+  #my($self) = shift;
+  return 1;
+}
+
+
+sub convert_slashes {
+  #my($self) = shift;
+
+  ## This is not a very reliable way to determine
+  ## whether this project will be used on Windows or UNIX.
+  if (defined $ENV{COMSPEC}) {
+    return 1;
+  }
+  else {
+    return 0;
+  }
 }
 
 
@@ -37,13 +49,59 @@ sub project_file_name {
     $name = $self->project_name();
   }
 
-  return $self->get_modified_project_file_name("ghs/$name", '.bld');
+  return $self->get_modified_project_file_name("$name", '.bld');
 }
 
 
+sub fill_value {
+  my($self)  = shift;
+  my($name)  = shift;
+  my($value) = undef;
+
+  if ($name =~ /^reltop_(\w+)/) {
+    $value = $self->relative($self->get_assignment($1));
+    if (defined $value &&
+        ($value =~ /^\.\.?$/ || $value =~ /^\.\.?\//)) {
+      my($top)  = $self->getstartdir();
+      my($part) = $self->getcwd();
+      $part =~ s/^$top[\/]?//;
+      if ($part ne '') {
+        if ($value eq '.') {
+          $value = $part;
+        }
+        else {
+          $value = $part . '/' . $value;
+        }
+      }
+    }
+  }
+  elsif ($name eq 'reltop') {
+    my($top) = $self->getstartdir();
+    $value = $self->getcwd();
+    $value =~ s/^$top[\/]?//;
+    if ($value eq '') {
+      $value = '.';
+    }
+  }
+
+  return $value;
+}
+
 sub get_dll_exe_template_input_file {
   #my($self) = shift;
-  return 'ghsexe';
+  return 'ghsdllexe';
+}
+
+
+sub get_lib_exe_template_input_file {
+  #my($self) = shift;
+  return 'ghslibexe';
+}
+
+
+sub get_lib_template_input_file {
+  #my($self) = shift;
+  return 'ghslib';
 }