Changeset 22387 for gs2-extensions

Timestamp:

2010-07-13T13:44:54+12:00 (14 years ago)

Author:

davidb

Message:

Renamed setup.pl to video-and-audio-setup.pl, so this file (and the equivalent in other extensions) can be uniquely loaded. Having them all as 'setup.pl' does not work, as after the first file is loaded in with a 'require' then any subsequent attempt to load the next extension's 'setup.pl' file fails, because (in Perl's view of the world) it has already loaded in 'setup.pl'

File:

• gs2-extensions/video/trunk/video-and-audio-setup.pl (moved) (moved from gs2-extensions/video/trunk/setup.pl ) (1 diff)

gs2-extensions/video/trunk/video-and-audio-setup.pl

@@ -10 +10 @@
 require util;    
 
-if (!defined $ENV{'GEXTVIDEO'}) {
+my $env_ext  = "GEXTVIDEO";
+my $ext_desc = "the Video and Audio Extension";
+
+if (!defined $ENV{$env_ext}) {
     
+    my $ext_home = cwd();
+    my $ext_os = $ENV{'GSDLOS'};
 
-    $ENV{'GEXTVIDEO'} = cwd();
-    print STDERR "**** GEXTVIDEO=$ENV{'GEXTVIDEO'}\n";
+    my ($ext_dir,$_prefix_dir) = File::Basename::fileparse($ext_home);
+
+    print STDERR "*** ext_dir = $ext_dir\n\n\n";
+
+
+    my $ext_installed = $env_ext."_INSTALLED";
+
+    $ENV{$env_ext} = $ext_home;
     
-    $ENV{'GEXTVIDEO_INSTALLED'}
-    = &util::filename_cat($ENV{'GEXTVIDEO'},"installed");
+    $ENV{$ext_installed} = &util::filename_cat($ext_home,$ext_os);
 
-    my $video_bin
-    = &util::filename_cat($ENV{'GEXTVIDEO_INSTALLED'},$ENV{'GSDLOS'},"bin");
-    my $video_lib
-    = &util::filename_cat($ENV{'GEXTVIDEO_INSTALLED'},$ENV{'GSDLOS'},"lib");
+    my $ext_bin = &util::filename_cat($ENV{$ext_installed},"bin");
+    my $ext_lib = &util::filename_cat($ENV{$ext_installed},"lib");
 
-    &util::envvar_append("PATH",$video_bin);
+    &util::envvar_append("PATH",$ext_bin);
 
-    # For Linux (no harm is setting is this for MacOs)
-    &util::envvar_append("LD_LIBRARY_PATH",$video_lib);
-    
-    # For MacOs (no harm is setting is this for Linux etc)
-    &util::envvar_append("DYLD_LIBRARY_PATH",$video_lib);
-
+    if ($ext_os =~ m/darwin/i) {
+    &util::envvar_append("DYLD_LIBRARY_PATH",$ext_lib);
+    }
+    else {
+    &util::envvar_append("LD_LIBRARY_PATH",$ext_lib);
+    }
 
     # GSDLEXTS always uses : as a separator
     if (defined $ENV{'GSDLEXTS'}) {
-    $ENV{'GSDLEXTS'} .= ":video" ;
+    $ENV{'GSDLEXTS'} .= ":$ext_dir";
     }
     else {
-    $ENV{'GSDLEXTS'} .="video";
+    $ENV{'GSDLEXTS'} = $ext_dir;
     }
+    
+    print STDERR "+Your environment is now setup for $ext_desc\n";
+}
+else {    
+    print STDERR "+Your environment is already setup for $ext_desc\n";
+}
 
+if (scalar(@ARGV>0)) {
+
+    print STDERR "\n";
+
+    my $cmd = join(" ",map {$_ = "\"$_\""} @ARGV);
+
+    if (system($cmd)!=0) {
+    print STDERR "\nError: Failed to run '$cmd'\n";
+    print STDERR "$!\n";
+    }
 }
+
+1;