for #270 - still more cleanup of builds

.gitignore

@@ -32,9 +32,9 @@ notes
 /xmsys2
 /pi2
 /qtifw
-/mxe
+/mxe32
 /mxe64
-/msw
+/msw32
 /msw64
 *.app
 req/binject

CHANGELOG

@@ -6,8 +6,22 @@
   Walkabout (3.3+) will be less compatible with the unmaintained 3.1 and with 4.0 (jRuby)
   We have interesting ideas of we what we do with Shoes that may be difficult
   to immplememt in Shoes 4. 
-
 
+-------------- Shoes 3.3.9 ------------------------------
+
+=== New with 3.3.8
+  * Ruby 2.4.5(6) Gems 3.03
+  * Updated versions of Gems (byebug, nokogiri, etc)
+
+=== Fixed with 3.3.8
+  * osx: improved building of gems if user has homebrew. 
+
+=== Developer Issues with 3.3.8
+  * Better cross building of gems (Windows from Linux)
+  * Ruby 2.4+ compatible. Tested with 2.5.5
+  * Support for 64 bit on Windows 10
+  * Can build Shoes for native windows api. Not working. 
+
 -------------- Shoes 3.3.7 ------------------------------
 
 === New with 3.3.7

crontasks/nbuild-shoes-all

@@ -3,8 +3,8 @@
 # my crontab so user name may not be set up for chroot
 #schroot -c debx86 -u ccoupe -- ~/Projects/shoes3/crontasks/nbuild-shoes-lin64
 ~/Projects/shoes3/crontasks/nbuild-shoes-xlin64
-~/Projects/shoes3/crontasks/nbuild-shoes-xwin7
-#~/Projects/shoes3/crontasks/nbuild-shoes-mxe
+#~/Projects/shoes3/crontasks/nbuild-shoes-xwin7
+~/Projects/shoes3/crontasks/nbuild-shoes-mxe
 # ssh to Mac mini and build.
 #~/Projects/shoes3/crontasks/nbuild-shoes-mavericks
 ~/Projects/shoes3/crontasks/nbuild-shoes-yosemite

crontasks/nbuild-shoes-mxe

@@ -4,8 +4,8 @@ echo "Build Shoes GTK Widgets for MinGW32 Windows"
 source ~/.rvm/scripts/rvm
 cd /home/ccoupe/Projects/shoes3
 rm -f build_target
-rvm use 2.3.6
-rake setup:mxe
+rvm use 2.4.5
+rake setup:mxe32
 rake
 rake package
 rake clobber

make/linux/mxe64/env.rb

@@ -40,7 +40,7 @@
 gtkdll = "#{GtkDeps}/bin"
 APP['LIBPATHS'] = [bindll, "#{EXT_RUBY}/bin"]
 
-WINVERSION = "#{APP['VERSION']}-gtk3-32"
+WINVERSION = "#{APP['VERSION']}-gtk3-64"
 WINFNAME = "#{APPNAME}-#{WINVERSION}"
 
 RUBY_HTTP = true

make/linux/xmsw32/env.rb

@@ -63,7 +63,7 @@
 WIN32_LIBS = []
 
 if APP['GDB']
-  WIN32_CFLAGS << "-g3 -O0"
+  WIN32_CFLAGS << "-g3 -O0 -DDEBUG"
 else
   WIN32_CFLAGS << "-O -Wall"
 end

make/linux/xmsw64/env.rb

@@ -1,7 +1,7 @@
 # xmsw cross  build  
 # TODO: missing curl
 # TODO: massage for mxe deps and locations. (basedll..)
-cf =(ENV['ENV_CUSTOM'] || "#{APP['VAGRANT']}xmsw-custom.yaml")
+cf =(ENV['ENV_CUSTOM'] || "#{APP['VAGRANT']}xmsw64-custom.yaml")
 gtk_version = '3'
 if File.exists? cf
   custmz = YAML.load_file(cf)
@@ -63,7 +63,7 @@
 WIN32_LIBS = []
 
 if APP['GDB']
-  WIN32_CFLAGS << "-g3 -O0"
+  WIN32_CFLAGS << "-g3 -O0 -DDEBUG"
 else
   WIN32_CFLAGS << "-O -Wall"
 end

shoes/native/native.h

@@ -61,7 +61,7 @@ int shoes_native_console();  // Yes it's different from terminal
 void shoes_native_terminal(char *, int, int, int, int, char *, char *, char *);
 void shoes_native_app_console();
 void shoes_native_browser_open(char *);  // TODO: unused? 
-void shoes__native_slot_init(VALUE, SHOES_SLOT_OS *, int, int, int, int, int, int);
+void shoes_native_slot_init(VALUE, SHOES_SLOT_OS *, int, int, int, int, int, int);
 void shoes_slot_init_menu(VALUE, SHOES_SLOT_OS *, int, int, int, int, int, int);
 cairo_t *shoes_native_cairo_create(shoes_canvas *);
 void shoes_native_slot_destroy(shoes_canvas *, shoes_canvas *);

shoes/native/windows.c

@@ -20,6 +20,12 @@ void shoes_native_get_time(SHOES_TIME *ts) {
  *ts = GetTickCount();
 }
 
+unsigned long shoes_diff_time(SHOES_TIME *start, SHOES_TIME *end)
+{
+  return *end - *start;
+}
+
+
 // calls from ruby.c - stubbed out until written for windows - see subsys.rb
 void shoes_svg_init() {
 }