Changeset 445

Timestamp:

03/04/2008 00:56:10 (6 months ago)

Author:

why

Message:

• platform/nix/shoes.launch: added symlink check to satisfy ticket #85.
  
• shoes/app.c: proper loading of the gtk icon, wherever shoes might run.
  

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• Rakefile (modified) (2 diffs)
• platform/nix (added)
• platform/nix/shoes.launch (added)
• shoes/app.c (modified) (1 diff)

trunk/Makefile

@@ -60 +60 @@
 
 dist/shoes.launch: dist/shoes-bin
-        @echo 'APPPATH="$${0%/*}"' > dist/shoes.launch
-        @echo 'LD_LIBRARY_PATH="$$APPPATH/../lib/shoes" $$APPPATH/../lib/shoes/shoes-bin $$@' >> dist/shoes.launch
+        @cp platform/nix/shoes.launch dist/
         @chmod 755 dist/shoes.launch
 

trunk/Rakefile

@@ -58 +58 @@
     File.open(before) do |b|
       b.each do |line|
-        a << line.gsub(reg) { reg2.gsub(%r!\\1!, Object.const_get($1)) }
+        a << line.gsub(reg) do
+          reg2.gsub(%r!\\1!, Object.const_get($1)) if reg2.include? '\1'
+          reg2
+        end
       end
     end
@@ -334 +337 @@
     sh "#{CC} -Ldist -o #{bin} bin/main.o #{LINUX_LIBS} -lshoes #{Config::CONFIG['LDFLAGS']}"
     if PLATFORM !~ /darwin/
-      sh %{echo 'APPPATH="${0%/*}"' > #{t.name}}
-      sh %{echo 'LD_LIBRARY_PATH=$APPPATH $APPPATH/#{File.basename(bin)} $@' >> #{t.name}}
+      rewrite "platform/nix/shoes.launch", t.name, %r!/shoes-bin!, "/#{NAME}-bin"
       chmod 0755, t.name
     end

trunk/shoes/app.c

@@ -1472 +1472 @@
 
 #ifdef SHOES_GTK
+  char icon_path[SHOES_BUFSIZE];
   shoes_app_gtk *gk = &app->os;
   shoes_slot_gtk *gs = &app->slot;
 
-  gtk_window_set_default_icon_from_file("static/shoes-icon.png", NULL);
+  sprintf(icon_path, "%s/static/shoes-icon.png", shoes_world->path);
+  gtk_window_set_default_icon_from_file(icon_path, NULL);
   gk->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (!app->resizable)