Skip to content

Commit

Permalink
for #312
Browse files Browse the repository at this point in the history
* move make/mingw/* to make/win32/loose/*
  a lot of code could be deleted - it's a placeholder target.
* more cosmetic changes to rake file outputs
* Might not such.
  • Loading branch information
Cecil committed Feb 13, 2017
1 parent a2edf95 commit d3a58a5
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 678 deletions.
16 changes: 7 additions & 9 deletions .gitignore
Expand Up @@ -21,15 +21,13 @@ deps
dist
pkg
notes
i686-linux
x86_64-linux
xarmv6hf
xmingw32
tightmingw
xwin7
win7
mavericks
xmavericks
/i686-linux
/x86_64-linux
/xarmv6hf
/xwin7
/win7
/mavericks
/xmavericks
snowleopard
xsnow
/msys2
Expand Down
55 changes: 29 additions & 26 deletions Rakefile
Expand Up @@ -84,58 +84,61 @@ CLEAN.include ["req/**/#{BIN}", "#{TGT_DIR}", "*.app"]
case RUBY_PLATFORM
when /mingw/
if CROSS
require File.expand_path("make/#{TGT_ARCH}/env")
require File.expand_path("make/#{TGT_ARCH}/tasks")
require File.expand_path("make/#{TGT_ARCH}/stubs")
require File.expand_path("make/win32/#{TGT_ARCH}/env")
require File.expand_path("make/win32/#{TGT_ARCH}/tasks")
require File.expand_path("make/win32/#{TGT_ARCH}/stubs")
require File.expand_path("make/gems")
else
require File.expand_path('rakefile_mingw')
require File.expand_path('make/win32/loose/env.rb')
require File.expand_path('make/win32/loose/tasks.rb')
puts "PLEASE SELECT a build environment from the win32 options "
puts" shown from a a `rake -T` "
end
Builder = MakeMinGW
NAMESPACE = :win32

when /darwin/

if CROSS
# Building tight shoes on OSX for OSX
require File.expand_path("make/#{TGT_ARCH}/env")
#require_relative "make/#{TGT_ARCH}/homebrew"
require File.expand_path("make/#{TGT_ARCH}/tasks")
require File.expand_path("make/#{TGT_ARCH}/stubs")
require File.expand_path("make/darwin/#{TGT_ARCH}/env")
require File.expand_path("make/darwin/#{TGT_ARCH}/tasks")
require File.expand_path("make/darwin/#{TGT_ARCH}/stubs")
require File.expand_path("make/gems")
else
# build Loose Shoes on OSX for OSX
puts "OSX: please select a target - see rake -T"
require File.expand_path('make/darwin/env')
require File.expand_path('make/darwin/tasks')
puts "This Shoes may not be portable to other OSX systems"
require File.expand_path('make/darwin/loose/env')
require File.expand_path('make/darwin/loose/tasks')
end
Builder = MakeDarwin
NAMESPACE = :osx

when /linux/
if CROSS
# This will be a Tight Shoes setup
case TGT_ARCH
when /x86_64-linux/
require File.expand_path('make/x86_64-linux/env')
require File.expand_path('make/x86_64-linux/tasks')
require File.expand_path('make/linux/x86_64-linux/env')
require File.expand_path('make/linux/x86_64-linux/tasks')
require File.expand_path("make/gems")
when /i686-linux/
require File.expand_path('make/i686-linux/env')
require File.expand_path('make/i686-linux/tasks')
require File.expand_path('make/linux/i686-linux/env')
require File.expand_path('make/linux/i686-linux/tasks')
require File.expand_path("make/gems")
when /pi2/
require File.expand_path('make/pi2/env')
require File.expand_path('make/pi2/tasks')
require File.expand_path('make/linux/pi2/env')
require File.expand_path('make/linux/pi2/tasks')
require File.expand_path("make/gems")
when /xarmv6hf/
require File.expand_path('make/xarm6hf/env')
require File.expand_path('make/xarm6hf/tasks')
require File.expand_path('make/linux/xarm6hf/env')
require File.expand_path('make/linux/xarm6hf/tasks')
require File.expand_path('make/gems')
when /xwin7/
require File.expand_path('make/xwin7/env')
require File.expand_path('make/xwin7/tasks')
require File.expand_path('make/xwin7/stubs')
require File.expand_path('make/xwin7/packdeps')
require File.expand_path('make/linux/xwin7/env')
require File.expand_path('make/linux/xwin7/tasks')
require File.expand_path('make/linux/xwin7/stubs')
require File.expand_path('make/linux/xwin7/packdeps')
require File.expand_path('make/gems')
else
puts "Unknown builder for #{TGT_ARCH}, removing setting"
Expand All @@ -144,8 +147,8 @@ when /linux/
else
# This is Loose Shoes setup
#TGT_DIR = "dist"
require File.expand_path('make/linux/env')
require File.expand_path('make/linux/tasks')
require File.expand_path('make/linux/loose/env')
require File.expand_path('make/linux/loose/tasks')
end
Builder = MakeLinux
NAMESPACE = :linux
Expand Down Expand Up @@ -254,7 +257,7 @@ end
# --------------------------
# tasks depending on Builder = MakeLinux|MakeDarwin|MakeMinGW

desc "Does a full compile, for the OS you're running on"
desc "Build using your OS setup"
task :build => ["#{NAMESPACE}:build"]

task :pre_build do
Expand Down
76 changes: 0 additions & 76 deletions make/darwin/env.rb

This file was deleted.

0 comments on commit d3a58a5

Please sign in to comment.