Skip to content

Commit e2ffb4e

Browse files
author
Cecil
committed
more rake fixes. Msys2 target works. replace Lacuna font.
1 parent 469f299 commit e2ffb4e

File tree

20 files changed

+230
-98
lines changed

20 files changed

+230
-98
lines changed

‎Rakefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,12 +389,12 @@ end
389389
def osx_version_txt t
390390
create_version_file t
391391
end
392-
=begin
393-
desc "create VERSION.txt"
392+
393+
# desc "create VERSION.txt"
394394
task :version do
395395
create_version_file 'VERSION.txt'
396396
end
397-
=end
397+
398398

399399
# --------------------------
400400
# tasks depending on Builder = MakeLinux|MakeDarwin|MakeMinGW

‎app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Shoes
22
major: 3
33
minor: 3
44
tiny: 7
5-
release: walkabout
5+
release: walkabout
66
revision: git
77
icons:
88
win32: platform/msw/shoes.ico

‎bugs/bug261.rb‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,45 @@
11
Shoes.app {
2+
23
vivaldifnt = font "vivaldi.ttf"
4+
if vivaldifnt
5+
para "This is the #{vivaldifnt[0]} font\n", font: "vivaldi"
6+
else
7+
alert "Failed to load Vivaldi"
8+
end
9+
coolfnt = font "#{DIR}/fonts/Coolvetica.ttf"
10+
if coolfnt
11+
para "This is the #{coolfnt[0]} font\n", font: coolfnt[0]
12+
else
13+
alert "Coolvetica failed to load"
14+
end
15+
=begin
316
lacunafnt = font "#{DIR}/fonts/Lacuna.ttf"
4-
para "This is the #{vivaldifnt[0]} font\n", font: vivaldifnt[0]
17+
if lacunafnt
18+
para "This is the #{lacunafnt[0]} font\n", font: lacunafnt[0]
19+
else
20+
alert "Failed to load Lacuna"
21+
end
22+
=end
23+
djfont = font "#{DIR}/fonts/DejaVuSans.ttf"
24+
if djfont
25+
para "This is the #{djfont[0]} font\n", font: djfont[0]
26+
else
27+
alert "Dejavu failed to load"
28+
end
529
para "This is the Default font\n"
6-
para "This is the #{lacunafnt[0]} font\n", font: "Lacuna"
7-
#para "#{Shoes::FONTS}\n", font: "Vivaldi"
30+
# nothing below here is displayed on Linux!
31+
lcfont = font "LaCosta_Regular.ttf"
32+
if lcfont
33+
para "This is the #{lcfont[0]} font\n", font: lcfont[0]
34+
else
35+
alert "La Costa Regular failed to load"
36+
end
37+
38+
para "\n..............................................\n"
839
para "#{Shoes::FONTS}\n", font: "Tunga"
40+
para "\n..............................................\n"
941
para "#{Shoes::FONTS}\n"
1042
para "\n..............................................\n"
1143
button "quit" do Shoes.quit end
44+
1245
}

‎crontasks/nbuild-shoes-all‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# my crontab so user name may not be set up for chroot
44
#schroot -c debx86 -u ccoupe -- ~/Projects/shoes3/crontasks/nbuild-shoes-lin64
55
~/Projects/shoes3/crontasks/nbuild-shoes-xlin64
6-
~/Projects/shoes3/crontasks/nbuild-shoes-xwin7
6+
#~/Projects/shoes3/crontasks/nbuild-shoes-xwin7
7+
~/Projects/shoes3/crontasks/nbuild-shoes-mxe
78
# ssh to Mac mini and build.
89
#~/Projects/shoes3/crontasks/nbuild-shoes-mavericks
910
~/Projects/shoes3/crontasks/nbuild-shoes-yosemite

‎crontasks/nbuild-shoes-bsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pwd
1111
echo $PATH
1212
rm -rf build_target
1313
rm -rf ~/build/freebsd
14-
rake bsd:setup:freebsd
14+
rake setup:freebsd
1515
rake
1616
rake package
1717
cp /usr/home/ccoupe/build/pkg/*freebsd*.install pkg

‎crontasks/nbuild-shoes-mxe‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
echo "Build Shoes GTK Widgets for MinGW32 Windows"
3+
#source ~/bin/bash-chroot
4+
source ~/.rvm/scripts/rvm
5+
cd /home/ccoupe/Projects/shoes3
6+
rm -f build_target
7+
rvm use 2.3.6
8+
rake setup:mxe
9+
rake
10+
rake package
11+
rake clobber
12+
ls -ld pkg/*.exe

‎crontasks/nbuild-shoes-xlin64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
echo "Build Shoes X86_64 for Linux"
33
cd /home/ccoupe/Projects/shoes3
44
rm -rf build_target
5-
rake linux:setup:xlin64
5+
rake setup:xlin64
66
rake
77
rake package
88
rake clobber

‎crontasks/nbuild-shoes-xrpi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
echo "Build Shoes rpi3"
33
cd ~/Projects/shoes3
44
rm -f build_target
5-
rake linux:setup:xrpi
5+
rake setup:xrpi
66
rake
77
rake package
88
rake clobber

‎crontasks/nbuild-shoes-xwin7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ~/.rvm/scripts/rvm
55
cd /home/ccoupe/Projects/shoes3
66
rm -f build_target
77
rvm use 2.3.6
8-
rake linux:setup:xwin7
8+
rake setup:xwin7
99
rake
1010
rake package
1111
rake clobber

‎crontasks/nbuild-shoes-yosemite‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/bin/bash
22
ssh ccoupe@mini <<'ENDSSH'
33
echo "Build Shoes OSX 10.10 Yosemite"
4-
source .bashrc
5-
rvm use 2.3.4
4+
PATH=/usr/local/bin:$PATH
5+
source ~/.bashrc
6+
#rvm use 2.3.6
67
cd /Users/ccoupe/Projects/shoes3
78
rm -f build_target
8-
rake osx:setup:yosemite
9+
rake setup:osx
910
rake
1011
rake package
1112
rake clobber

0 commit comments

Comments
 (0)