qtbindings 4.8.5.2-x86-mingw32 → 4.8.6.0-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (98) hide show
  1. checksums.yaml +4 -4
  2. data/README.txt +41 -20
  3. data/Rakefile +18 -1
  4. data/bin/2.0/rbrcc.exe +0 -0
  5. data/bin/2.0/rbuic4.exe +0 -0
  6. data/bin/2.0/smokeapi.exe +0 -0
  7. data/bin/2.0/smokedeptool.exe +0 -0
  8. data/bin/2.1/rbrcc.exe +0 -0
  9. data/bin/2.1/rbuic4.exe +0 -0
  10. data/bin/2.1/smokeapi.exe +0 -0
  11. data/bin/2.1/smokedeptool.exe +0 -0
  12. data/bin/rbrcc +1 -5
  13. data/bin/rbuic4 +1 -5
  14. data/bin/smokeapi +1 -5
  15. data/bin/smokedeptool +1 -5
  16. data/examples/threading/main_thread.rb +19 -0
  17. data/extconf.rb +21 -67
  18. data/lib/2.0/libqtruby4shared.dll +0 -0
  19. data/lib/2.0/libsmokebase.dll +0 -0
  20. data/lib/2.0/libsmokeqtcore.dll +0 -0
  21. data/lib/2.0/libsmokeqtdeclarative.dll +0 -0
  22. data/lib/2.0/libsmokeqtgui.dll +0 -0
  23. data/lib/2.0/libsmokeqthelp.dll +0 -0
  24. data/lib/2.0/libsmokeqtmultimedia.dll +0 -0
  25. data/lib/2.0/libsmokeqtnetwork.dll +0 -0
  26. data/lib/2.0/libsmokeqtopengl.dll +0 -0
  27. data/lib/2.0/libsmokeqtscript.dll +0 -0
  28. data/lib/2.0/libsmokeqtsql.dll +0 -0
  29. data/lib/2.0/libsmokeqtsvg.dll +0 -0
  30. data/lib/2.0/libsmokeqttest.dll +0 -0
  31. data/lib/2.0/libsmokeqtuitools.dll +0 -0
  32. data/lib/2.0/libsmokeqtwebkit.dll +0 -0
  33. data/lib/2.0/libsmokeqtxml.dll +0 -0
  34. data/lib/2.0/libsmokeqtxmlpatterns.dll +0 -0
  35. data/lib/2.0/qtdeclarative.so +0 -0
  36. data/lib/2.0/qtruby4.so +0 -0
  37. data/lib/2.0/qtscript.so +0 -0
  38. data/lib/2.0/qttest.so +0 -0
  39. data/lib/2.0/qtuitools.so +0 -0
  40. data/lib/2.0/qtwebkit.so +0 -0
  41. data/lib/2.1/libqtruby4shared.dll +0 -0
  42. data/lib/2.1/libsmokebase.dll +0 -0
  43. data/lib/2.1/libsmokeqtcore.dll +0 -0
  44. data/lib/2.1/libsmokeqtdeclarative.dll +0 -0
  45. data/lib/{1.9 → 2.1}/libsmokeqtgui.dll +0 -0
  46. data/lib/2.1/libsmokeqthelp.dll +0 -0
  47. data/lib/2.1/libsmokeqtmultimedia.dll +0 -0
  48. data/lib/2.1/libsmokeqtnetwork.dll +0 -0
  49. data/lib/2.1/libsmokeqtopengl.dll +0 -0
  50. data/lib/2.1/libsmokeqtscript.dll +0 -0
  51. data/lib/2.1/libsmokeqtsql.dll +0 -0
  52. data/lib/2.1/libsmokeqtsvg.dll +0 -0
  53. data/lib/2.1/libsmokeqttest.dll +0 -0
  54. data/lib/2.1/libsmokeqtuitools.dll +0 -0
  55. data/lib/2.1/libsmokeqtwebkit.dll +0 -0
  56. data/lib/2.1/libsmokeqtxml.dll +0 -0
  57. data/lib/2.1/libsmokeqtxmlpatterns.dll +0 -0
  58. data/lib/2.1/qtdeclarative.so +0 -0
  59. data/lib/2.1/qtruby4.so +0 -0
  60. data/lib/2.1/qtscript.so +0 -0
  61. data/lib/2.1/qttest.so +0 -0
  62. data/lib/2.1/qtuitools.so +0 -0
  63. data/lib/2.1/qtwebkit.so +0 -0
  64. data/lib/Qt/qtruby4.rb +2 -1
  65. data/lib/Qt4.rb +20 -13
  66. data/lib/qtbindings_version.rb +2 -2
  67. data/lib/qtdeclarative/qtdeclarative.rb +17 -0
  68. data/qtbindingsnative.gemspec +1 -1
  69. metadata +84 -83
  70. data/CMakeLists.txt +0 -22
  71. data/bin/1.9/rbrcc.exe +0 -0
  72. data/bin/1.9/rbuic4.exe +0 -0
  73. data/bin/1.9/smokeapi.exe +0 -0
  74. data/bin/1.9/smokedeptool.exe +0 -0
  75. data/examples/base/kicons.rb +0 -54
  76. data/examples/base/rui.rb +0 -21
  77. data/examples/textedit/textedit.rb +0 -150
  78. data/lib/1.9/libqtruby4shared.dll +0 -0
  79. data/lib/1.9/libsmokebase.dll +0 -0
  80. data/lib/1.9/libsmokeqtcore.dll +0 -0
  81. data/lib/1.9/libsmokeqthelp.dll +0 -0
  82. data/lib/1.9/libsmokeqtmultimedia.dll +0 -0
  83. data/lib/1.9/libsmokeqtnetwork.dll +0 -0
  84. data/lib/1.9/libsmokeqtopengl.dll +0 -0
  85. data/lib/1.9/libsmokeqtscript.dll +0 -0
  86. data/lib/1.9/libsmokeqtsql.dll +0 -0
  87. data/lib/1.9/libsmokeqtsvg.dll +0 -0
  88. data/lib/1.9/libsmokeqttest.dll +0 -0
  89. data/lib/1.9/libsmokeqtuitools.dll +0 -0
  90. data/lib/1.9/libsmokeqtwebkit.dll +0 -0
  91. data/lib/1.9/libsmokeqtxml.dll +0 -0
  92. data/lib/1.9/libsmokeqtxmlpatterns.dll +0 -0
  93. data/lib/1.9/qtruby4.so +0 -0
  94. data/lib/1.9/qtscript.so +0 -0
  95. data/lib/1.9/qttest.so +0 -0
  96. data/lib/1.9/qtuitools.so +0 -0
  97. data/lib/1.9/qtwebkit.so +0 -0
  98. data/qtbindings-qt.gemspec +0 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 767f226fd67b62e5f7a909b24ce13de0174634c5
4
- data.tar.gz: ac9d37c50a4ab194d218f37d02e9ed66b1408114
3
+ metadata.gz: 5713dff705d41ce524a6af91d7df0276d63e9946
4
+ data.tar.gz: 40650adbcd1b5f3f06e60388bcb2bce9b826e7dc
5
5
  SHA512:
6
- metadata.gz: b6e7a96ce9fef8d8c10df4a2e9ed4569e81dc6df2ff778e9f4ed840036125e71a1a6869fbb6744fa613dcba2eb1b0386ae2737eb1c476a1dc4e57157a7b7f714
7
- data.tar.gz: e0a5f7a2ec699e8547cfce1adb6b156ebfcd395f7ae94b460fcbe94efaa88fa8c92f356c2d10fd1845ec45e1dd0c65ed575ab48098a19bd53fad19246c93e43d
6
+ metadata.gz: f8093c5fb1be781649556c36b604e0b9b5d901283f50e1516772b098159661a6737656868273c3981888aa491b1249ed1f2278e2973a6e055cb0ff0763aa612c
7
+ data.tar.gz: 2c64bfd5d8137108b53bd47ca8eca2c8173b12f1b4e027440fdfaab9874a69e99e1dd2759560ff401bf906ebec86004e8a50326561f9ea81b6a6698287558773
data/README.txt CHANGED
@@ -10,37 +10,47 @@ Goals
10
10
  1. To make it easy to install a Qt binding for Ruby on all platforms using
11
11
  RubyGems
12
12
  2. To maintain an up-to-date binary gem for Windows that is bundled with
13
- the latest version of Qt from http://qt.nokia.com
13
+ the latest version of Qt
14
14
  3. To reduce the scope and maintenance of the bindings to only bind to the
15
15
  libraries provided by the Qt SDK.
16
16
  4. To increase compatibility with non-linux platforms
17
17
 
18
- Note: This gem only supports Ruby 1.9.3 and Ruby 2.0.0 starting at qtbindings version 4.8.5.0.
18
+ Note: This gem supports Ruby 2.0.0+ starting at qtbindings version 4.8.6.0.
19
+ For Ruby 1.9.3 you should use version 4.8.5.2.
19
20
  For Ruby 1.8.x you can try installing version 4.8.3.0, however upgrading Ruby is
20
21
  highly recommended.
21
22
 
22
23
  Usage Notes
23
24
  ------------
24
- Ruby threading is now fully supported out of the box. All GUI access however must be done
25
- inside the main thread. To support updating the GUI using other threads, use the following function
25
+ Ruby threading is now fully supported out of the box. All GUI access however must be done
26
+ inside the main thread. To support updating the GUI using other threads, use the following function
26
27
  provided in Qt4.rb:
27
28
 
28
- Qt.execute_in_main_thread(true) do
29
- # GUI code here
29
+ Qt.execute_in_main_thread do # block the main thread
30
+ # GUI code which executes and then allows the main thread to execute
31
+ end
32
+
33
+ Qt.execute_in_main_thread(false) do # don't block the main thread
34
+ # GUI code which executes in parallel with the main thread
30
35
  end
31
36
 
32
37
  Tested Environments
33
38
  --------------------
34
- Mac OSX 10.6.8 (Snow Leopard)
35
- XCode 3.2.6 (gcc 4.2.1)
36
- Brew - QT 4.8.5
37
- Cmake 2.8.11.2
38
- Ruby 1.9.3p448
39
+ Mac OSX 10.9.1 (Mavericks)
40
+ XCode 5 (clang)
41
+ Brew - QT 4.8.6
42
+ Cmake 2.8.9
43
+ Ruby 2.0.0p353 - Must be compiled with clang (rvm install <version> --with-gcc=clang)
39
44
 
40
45
  Windows XP SP3
41
46
  QT SDK 4.8.5
42
47
  Cmake 2.8.8
43
- Ruby 1.9.3p448 and Ruby 2.0.0p353 installed from rubyinstaller.org
48
+ Ruby Ruby 2.0.0p481 installed from rubyinstaller.org
49
+
50
+ Windows 7 SP1
51
+ QT SDK 4.8.6
52
+ Cmake 2.8.12.2
53
+ Ruby 2.0.0p353 installed from rubyinstaller.org
44
54
 
45
55
  Ubuntu Linux 11.10
46
56
  QT SDK 4.8.1
@@ -52,7 +62,12 @@ Compiling qtbindings requires the following prerequisites:
52
62
  1. cmake 2.8.x installed and in your path
53
63
  2. QT 4.8.x installed and in your path
54
64
  3. Ruby installed and in your path
55
- 4. gcc 4.x
65
+ 4. gcc 4.x (or clang for OSX 10.9)
66
+ For Windows this means getting MingGW-w64 from http://mingw-w64.sourceforge.net/download.php (Win-builds project)
67
+
68
+ Note for OSX 10.9. The default compiler has changed from gcc to clang. All libraries
69
+ need to be compiled with clang or you will get segfaults. This includes ruby, qt, and qtbindings.
70
+ *** rvm does not compile with clang by default. You must add --with-gcc=clang when installing a version of ruby ***
56
71
 
57
72
  Additionally: all of the operating system prequisites for compiling,
58
73
  window system development, opengl, etc must be installed.
@@ -64,18 +79,20 @@ Perform the following steps to build the gem on Unix or Mac:
64
79
  Where the x is the subversion of QT and y is the patch level of qtbindings
65
80
 
66
81
  Perform the following steps to build the gem on Windows:
67
- 1. Ensure you are running Ruby 1.9.3
68
- ruby -v #=> ruby 1.9.3
82
+ 1. Ensure you are running Ruby 2.0.0
83
+ ruby -v #=> ruby 2.0.0
69
84
  2. rake distclean
70
85
  3. rake build
71
- 4. Switch to Ruby 2.0.0
72
- ruby -v #=> ruby 2.0.0
86
+ 4. Switch to Ruby 2.1.3
87
+ ruby -v #=> ruby 2.1.3
73
88
  5. rake build
74
89
  6. rake VERSION=4.8.x.y gemnative
75
90
  Where the x is the subversion of QT and y is the patch level of qtbindings
91
+ 7. rake VERSION=4.8.x.y gemqt
92
+ Where the x is the subversion of QT and y is the patch level of qtbindings
76
93
 
77
94
  Note: The gem is built twice to create the FAT binary which will work
78
- on both Ruby 1.9 and 2.0. The Windows utility called pik is useful for
95
+ on both Ruby 2.0 and 2.1. The Windows utility called pik is useful for
79
96
  switching between Ruby versions.
80
97
 
81
98
  After building the gem, verify the examples work by running:
@@ -88,7 +105,7 @@ Debian Linux
88
105
  1. The following should get you the packages you need:
89
106
  sudo aptitude install build-essential bison openssl libreadline5
90
107
  libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim
91
- libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev
108
+ libsqlite3-0 libsqlite3-dev sqlite3
92
109
  libxml2-dev git-core subversion autoconf xorg-dev libgl1-mesa-dev
93
110
  libglu1-mesa-dev
94
111
 
@@ -100,7 +117,8 @@ Mac OSX Snow Leopard
100
117
 
101
118
  Windows - Note: Only necessary for debugging (binary gem available)
102
119
  --------
103
- 1. mingw 4.4 in your path (from here or elsewhere: http://nosymbolfound.blogspot.com/2012/12/since-until-now-qt-under-windows-is.html#!/2012/12/since-until-now-qt-under-windows-is.html)
120
+ QT 4.8.6 requires mingw 4.8.2 from http://mingw-w64.sourceforge.net/download.php (Win-builds project)
121
+ QT 4.8.5 requires mingw 4.4 from here or elsewhere: http://nosymbolfound.blogspot.com/2012/12/since-until-now-qt-under-windows-is.html#!/2012/12/since-until-now-qt-under-windows-is.html)
104
122
 
105
123
  Install
106
124
  ------
@@ -121,6 +139,9 @@ License:
121
139
  This library is released under the LGPL Version 2.1.
122
140
  See COPYING.LIB.txt
123
141
 
142
+ Contributing:
143
+ Fork the project and submit pull requests.
144
+
124
145
  Disclaimer:
125
146
  Almost all of this code was written by the guys who worked on the KDE
126
147
  bindings project, particurly Arno Rehn and Richard Dale. I hope to increase
data/Rakefile CHANGED
@@ -6,8 +6,14 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
6
6
 
7
7
  if windows
8
8
  MAKE = 'mingw32-make'
9
+ SLASH = '\\'
10
+ COPY = 'copy'
11
+ DEL = 'del'
9
12
  else
10
13
  MAKE = 'make'
14
+ SLASH = '/'
15
+ COPY = 'cp'
16
+ DEL = 'rm'
11
17
  end
12
18
 
13
19
  def warn_version
@@ -20,6 +26,10 @@ def set_version
20
26
  file.write("QTBINDINGS_VERSION = '#{ENV['VERSION']}'\n")
21
27
  file.write("QTBINDINGS_RELEASE_DATE = '#{Time.now}'\n")
22
28
  end
29
+ File.open('qtlib/qtbindings_qt_version.rb', 'w') do |file|
30
+ file.write("QTBINDINGS_QT_VERSION = '#{ENV['VERSION'].split('.')[0..-2].join('.')}'\n")
31
+ file.write("QTBINDINGS_QT_RELEASE_DATE = '#{Time.now}'\n")
32
+ end
23
33
  end
24
34
  end
25
35
 
@@ -29,6 +39,10 @@ def clear_version
29
39
  file.write("QTBINDINGS_VERSION = '0.0.0.0'\n")
30
40
  file.write("QTBINDINGS_RELEASE_DATE = ''\n")
31
41
  end
42
+ File.open('lib/qtbindings_qt_version.rb', 'w') do |file|
43
+ file.write("QTBINDINGS_QT_VERSION = '0.0.0'\n")
44
+ file.write("QTBINDINGS_QT_RELEASE_DATE = ''\n")
45
+ end
32
46
  end
33
47
  end
34
48
 
@@ -84,8 +98,9 @@ end
84
98
  task :gemnative do
85
99
  warn_version()
86
100
  set_version()
87
- system("#{MAKE} installqt")
101
+ system("#{COPY} gemspecs#{SLASH}qtbindingsnative.gemspec .")
88
102
  system("gem build qtbindingsnative.gemspec")
103
+ system("#{DEL} qtbindingsnative.gemspec")
89
104
  clear_version()
90
105
  end
91
106
 
@@ -93,7 +108,9 @@ task :gemqt do
93
108
  warn_version()
94
109
  set_version()
95
110
  system("#{MAKE} installqt")
111
+ system("#{COPY} gemspecs#{SLASH}qtbindings-qt.gemspec .")
96
112
  system("gem build qtbindings-qt.gemspec")
113
+ system("#{DEL} qtbindings-qt.gemspec")
97
114
  clear_version()
98
115
  end
99
116
 
data/bin/2.0/rbrcc.exe CHANGED
Binary file
data/bin/2.0/rbuic4.exe CHANGED
Binary file
data/bin/2.0/smokeapi.exe CHANGED
Binary file
Binary file
data/bin/2.1/rbrcc.exe ADDED
Binary file
Binary file
Binary file
Binary file
data/bin/rbrcc CHANGED
@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
10
10
  extension = ''
11
11
  extension = '.exe' if windows
12
12
 
13
- if RUBY_VERSION.split('.')[0].to_i == 1
14
- path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "rbrcc#{extension}"))
15
- else
16
- path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "rbrcc#{extension}"))
17
- end
13
+ path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "rbrcc#{extension}"))
18
14
  exec(path, *ARGV)
data/bin/rbuic4 CHANGED
@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
10
10
  extension = ''
11
11
  extension = '.exe' if windows
12
12
 
13
- if RUBY_VERSION.split('.')[0].to_i == 1
14
- path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "rbuic4#{extension}"))
15
- else
16
- path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "rbuic4#{extension}"))
17
- end
13
+ path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "rbuic4#{extension}"))
18
14
  exec(path, *ARGV)
data/bin/smokeapi CHANGED
@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
10
10
  extension = ''
11
11
  extension = '.exe' if windows
12
12
 
13
- if RUBY_VERSION.split('.')[0].to_i == 1
14
- path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "smokeapi#{extension}"))
15
- else
16
- path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "smokeapi#{extension}"))
17
- end
13
+ path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "smokeapi#{extension}"))
18
14
  exec(path, *ARGV)
data/bin/smokedeptool CHANGED
@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
10
10
  extension = ''
11
11
  extension = '.exe' if windows
12
12
 
13
- if RUBY_VERSION.split('.')[0].to_i == 1
14
- path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "smokedeptool#{extension}"))
15
- else
16
- path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "smokedeptool#{extension}"))
17
- end
13
+ path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "smokedeptool#{extension}"))
18
14
  exec(path, *ARGV)
@@ -0,0 +1,19 @@
1
+ #!/usr/bin/ruby -W
2
+ require "Qt"
3
+
4
+ app = Qt::Application.new(ARGV)
5
+
6
+ hello = Qt::PushButton.new('Hello World!')
7
+ hello.resize(100, 30)
8
+ hello.show()
9
+
10
+ # This code hangs the application because it is trying to access the GUI
11
+ # (QT code) outside of the main thread
12
+ #Thread.new { sleep 2; hello.resize(200,50) }
13
+
14
+ # This code executes because it puts the GUI code inside
15
+ # Qt.execute_in_main_thread
16
+ Qt.execute_in_main_thread { sleep 2; hello.resize(200,50) }
17
+
18
+ app.exec()
19
+
data/extconf.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # Generates a Makefile that:
2
2
  # 1. Cleans up the build directory
3
- # 2. Runs cmake to build qtbind
3
+ # 2. Runs cmake to build qtbindings
4
4
  # 3. Copies the built .so files into the correct places
5
5
 
6
6
  windows = false
@@ -9,21 +9,16 @@ processor, platform, *rest = RUBY_PLATFORM.split("-")
9
9
  windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
10
10
  macosx = true if platform =~ /darwin/
11
11
 
12
- ruby_version_split = RUBY_VERSION.split('.')
13
- if ruby_version_split[0].to_i == 1
14
- ruby_version = '1.9'
15
- if ruby_version_split[1].to_i == 8
16
- puts "Ruby 1.8.x is no longer supported. Install qtbindings 4.8.3.0. gem install qtbindings -v 4.8.3.0"
17
- exit
18
- end
19
- else
20
- ruby_version = '2.0'
12
+ ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
13
+ if ruby_version == "1.8"
14
+ puts "Ruby 1.8.x is no longer supported. Install qtbindings 4.8.3.0. gem install qtbindings -v 4.8.3.0"
15
+ exit
21
16
  end
22
17
 
23
18
  if windows
24
19
  # README! - Modify this path if you have QT installed somewhere else
25
20
  # or if you have a different version of QT you want to link to.
26
- qt_sdk_path = "C:\\Qt\\4.8.5"
21
+ qt_sdk_path = "C:\\Qt\\4.8.6"
27
22
  begin
28
23
  File::Stat.new(qt_sdk_path)
29
24
  rescue
@@ -38,8 +33,7 @@ File.open('Makefile', 'w') do |file|
38
33
  file.puts ""
39
34
  file.puts "makedirs:"
40
35
  file.puts "\t-mkdir ext\\build"
41
- file.puts "\t-mkdir bin\\1.9"
42
- file.puts "\t-mkdir bin\\2.0"
36
+ file.puts "\t-mkdir bin\\#{ruby_version}"
43
37
  file.puts "\t-mkdir qtbin\\plugins"
44
38
  file.puts "\t-mkdir qtbin\\plugins\\accessible"
45
39
  file.puts "\t-mkdir qtbin\\plugins\\bearer"
@@ -51,8 +45,7 @@ File.open('Makefile', 'w') do |file|
51
45
  file.puts "\t-mkdir qtbin\\plugins\\phonon_backend"
52
46
  file.puts "\t-mkdir qtbin\\plugins\\qmltooling"
53
47
  file.puts "\t-mkdir qtbin\\plugins\\sqldrivers"
54
- file.puts "\t-mkdir lib\\1.9"
55
- file.puts "\t-mkdir lib\\2.0"
48
+ file.puts "\t-mkdir lib\\#{ruby_version}"
56
49
  file.puts ""
57
50
  file.puts "clean: makedirs"
58
51
  file.puts "\t-cd ext\\build && rmdir /S /Q CMakeFiles"
@@ -77,10 +70,8 @@ File.open('Makefile', 'w') do |file|
77
70
  file.puts "\t-cd qtbin\\plugins\\phonon_backend && del /F /Q *"
78
71
  file.puts "\t-cd qtbin\\plugins\\qmltooling && del /F /Q *"
79
72
  file.puts "\t-cd qtbin\\plugins\\sqldrivers && del /F /Q *"
80
- file.puts "\t-cd bin\\1.9 && del /F /Q *"
81
- file.puts "\t-cd bin\\2.0 && del /F /Q *"
82
- file.puts "\t-cd lib\\1.9 && del /F /Q *"
83
- file.puts "\t-cd lib\\2.0 && del /F /Q *"
73
+ file.puts "\t-cd bin\\#{ruby_version} && del /F /Q *"
74
+ file.puts "\t-cd lib\\#{ruby_version} && del /F /Q *"
84
75
  file.puts "\t-del /F /Q Makefile"
85
76
  file.puts "\t-del /F /Q qtbindings-*.gem"
86
77
  file.puts ""
@@ -95,32 +86,14 @@ File.open('Makefile', 'w') do |file|
95
86
  end
96
87
  file.puts "-DCMAKE_MAKE_PROGRAM=mingw32-make.exe \\"
97
88
  file.puts "-Wno-dev \\"
98
- file.puts "-DENABLE_SMOKE=on \\"
99
- file.puts "-DENABLE_QTCORE_SMOKE=on \\"
100
- file.puts "-DENABLE_QTNETWORK_SMOKE=on \\"
101
- file.puts "-DENABLE_QTDBUS_SMOKE=off \\"
102
- file.puts "-DENABLE_QTGUI_SMOKE=on \\"
103
- file.puts "-DENABLE_QTSVG_SMOKE=on \\"
104
- file.puts "-DENABLE_QTSQL_SMOKE=on \\"
105
- file.puts "-DENABLE_QTXML_SMOKE=on \\"
106
- file.puts "-DENABLE_QTXMLPATTERNS_SMOKE=on \\"
107
- file.puts "-DENABLE_QTOPENGL_SMOKE=on \\"
108
- file.puts "-DENABLE_QTWEBKIT_SMOKE=on \\"
109
- file.puts "-DENABLE_QTSCRIPT_SMOKE=on \\"
110
- file.puts "-DENABLE_QTUITOOLS_SMOKE=on \\"
111
- file.puts "-DENABLE_QTTEST_SMOKE=on \\"
112
- file.puts "-DENABLE_QTMULTIMEDIA_SMOKE=on \\"
113
- file.puts "-DENABLE_QTRUBY=on \\"
114
- file.puts "-DENABLE_QTWEBKIT_RUBY=on \\"
115
- file.puts "-DENABLE_QTUITOOLS_RUBY=on \\"
116
- file.puts "-DENABLE_QTSCRIPT=on \\"
117
- file.puts "-DENABLE_QTTEST=on \\"
89
+ file.puts "-DRUBY_EXECUTABLE=#{File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])} \\"
118
90
  file.puts ".."
119
91
  file.puts "\tcd ext\\build && mingw32-make"
120
92
  file.puts ""
121
93
  file.puts "install: makedirs"
122
94
  file.puts "\t-copy ext\\build\\smoke\\deptool\\smokedeptool.exe bin\\#{ruby_version}"
123
95
  file.puts "\t-copy ext\\build\\smoke\\qtcore\\libsmokeqtcore.dll lib\\#{ruby_version}"
96
+ file.puts "\t-copy ext\\build\\smoke\\qtdeclarative\\libsmokeqtdeclarative.dll lib\\#{ruby_version}"
124
97
  file.puts "\t-copy ext\\build\\smoke\\qtgui\\libsmokeqtgui.dll lib\\#{ruby_version}"
125
98
  file.puts "\t-copy ext\\build\\smoke\\qthelp\\libsmokeqthelp.dll lib\\#{ruby_version}"
126
99
  file.puts "\t-copy ext\\build\\smoke\\qtmultimedia\\libsmokeqtmultimedia.dll lib\\#{ruby_version}"
@@ -137,6 +110,7 @@ File.open('Makefile', 'w') do |file|
137
110
  file.puts "\t-copy ext\\build\\smoke\\smokeapi\\smokeapi.exe bin\\#{ruby_version}"
138
111
  file.puts "\t-copy ext\\build\\smoke\\smokebase\\libsmokebase.dll lib\\#{ruby_version}"
139
112
  file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\libqtruby4shared.dll lib\\#{ruby_version}"
113
+ file.puts "\t-copy ext\\build\\ruby\\qtdeclarative\\qtdeclarative.dll lib\\#{ruby_version}\\qtdeclarative.so"
140
114
  file.puts "\t-copy ext\\build\\ruby\\qtruby\\src\\qtruby4.dll lib\\#{ruby_version}\\qtruby4.so"
141
115
  file.puts "\t-copy ext\\build\\ruby\\qtscript\\qtscript.dll lib\\#{ruby_version}\\qtscript.so"
142
116
  file.puts "\t-copy ext\\build\\ruby\\qttest\\qttest.dll lib\\#{ruby_version}\\qttest.so"
@@ -183,8 +157,7 @@ File.open('Makefile', 'w') do |file|
183
157
  file.puts ""
184
158
  file.puts "makedirs:"
185
159
  file.puts "\t-mkdir ext/build"
186
- file.puts "\t-mkdir bin/1.9"
187
- file.puts "\t-mkdir bin/2.0"
160
+ file.puts "\t-mkdir bin/#{ruby_version}"
188
161
  file.puts "\t-mkdir bin/plugins"
189
162
  file.puts "\t-mkdir bin/plugins/accessible"
190
163
  file.puts "\t-mkdir bin/plugins/bearer"
@@ -196,8 +169,7 @@ File.open('Makefile', 'w') do |file|
196
169
  file.puts "\t-mkdir bin/plugins/phonon_backend"
197
170
  file.puts "\t-mkdir bin/plugins/qmltooling"
198
171
  file.puts "\t-mkdir bin/plugins/sqldrivers"
199
- file.puts "\t-mkdir lib/1.9"
200
- file.puts "\t-mkdir lib/2.0"
172
+ file.puts "\t-mkdir lib/#{ruby_version}"
201
173
  file.puts ""
202
174
  file.puts "clean: makedirs"
203
175
  file.puts "\t-cd ext/build; rm -rf CMakeFiles"
@@ -221,10 +193,8 @@ File.open('Makefile', 'w') do |file|
221
193
  file.puts "\t-cd bin/plugins/phonon_backend && rm *"
222
194
  file.puts "\t-cd bin/plugins/qmltooling && rm *"
223
195
  file.puts "\t-cd bin/plugins/sqldrivers && rm *"
224
- file.puts "\t-cd bin/1.9 && rm *"
225
- file.puts "\t-cd bin/2.0 && rm *"
226
- file.puts "\t-cd lib/1.9 && rm *"
227
- file.puts "\t-cd lib/2.0 && rm *"
196
+ file.puts "\t-cd bin/#{ruby_version} && rm *"
197
+ file.puts "\t-cd lib/#{ruby_version} && rm *"
228
198
  file.puts "\t-rm Makefile"
229
199
  file.puts "\t-rm qtbindings-*.gem"
230
200
  file.puts ""
@@ -236,26 +206,7 @@ File.open('Makefile', 'w') do |file|
236
206
  file.puts "-DCMAKE_BUILD_TYPE=Debug \\"
237
207
  end
238
208
  file.puts "-Wno-dev \\"
239
- file.puts "-DENABLE_SMOKE=on \\"
240
- file.puts "-DENABLE_QTCORE_SMOKE=on \\"
241
- file.puts "-DENABLE_QTNETWORK_SMOKE=on \\"
242
- file.puts "-DENABLE_QTDBUS_SMOKE=on \\"
243
- file.puts "-DENABLE_QTGUI_SMOKE=on \\"
244
- file.puts "-DENABLE_QTSVG_SMOKE=on \\"
245
- file.puts "-DENABLE_QTSQL_SMOKE=on \\"
246
- file.puts "-DENABLE_QTXML_SMOKE=on \\"
247
- file.puts "-DENABLE_QTXMLPATTERNS_SMOKE=on \\"
248
- file.puts "-DENABLE_QTOPENGL_SMOKE=on \\"
249
- file.puts "-DENABLE_QTWEBKIT_SMOKE=on \\"
250
- file.puts "-DENABLE_QTSCRIPT_SMOKE=on \\"
251
- file.puts "-DENABLE_QTUITOOLS_SMOKE=on \\"
252
- file.puts "-DENABLE_QTTEST_SMOKE=on \\"
253
- file.puts "-DENABLE_QTMULTIMEDIA_SMOKE=on \\"
254
- file.puts "-DENABLE_QTRUBY=on \\"
255
- file.puts "-DENABLE_QTWEBKIT_RUBY=on \\"
256
- file.puts "-DENABLE_QTUITOOLS_RUBY=on \\"
257
- file.puts "-DENABLE_QTSCRIPT=on \\"
258
- file.puts "-DENABLE_QTTEST=on \\"
209
+ file.puts "-DRUBY_EXECUTABLE=#{File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])} \\"
259
210
  file.puts ".."
260
211
  file.puts "\tcd ext/build; make"
261
212
  file.puts ""
@@ -263,6 +214,7 @@ File.open('Makefile', 'w') do |file|
263
214
  if macosx
264
215
  file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
265
216
  file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
217
+ file.puts "\t-cp ext/build/ruby/qtdeclarative/qtdeclarative.so lib/#{ruby_version}/qtdeclarative.bundle"
266
218
  file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.so lib/#{ruby_version}/qtruby4.bundle"
267
219
  file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}/qtscript.bundle"
268
220
  file.puts "\t-cp ext/build/ruby/qttest/qttest.* lib/#{ruby_version}/qttest.bundle"
@@ -274,6 +226,7 @@ File.open('Makefile', 'w') do |file|
274
226
  file.puts "\t-cp ext/build/smoke/deptool/smokedeptool bin/#{ruby_version}"
275
227
  file.puts "\t-cp ext/build/smoke/qtcore/libsmokeqtcore.* lib/#{ruby_version}"
276
228
  file.puts "\t-cp ext/build/smoke/qtdbus/libsmokeqtdbus.* lib/#{ruby_version}"
229
+ file.puts "\t-cp ext/build/smoke/qtdeclarative/libsmokeqtdeclarative.* lib/#{ruby_version}"
277
230
  file.puts "\t-cp ext/build/smoke/qtgui/libsmokeqtgui.* lib/#{ruby_version}"
278
231
  file.puts "\t-cp ext/build/smoke/qthelp/libsmokeqthelp.* lib/#{ruby_version}"
279
232
  file.puts "\t-cp ext/build/smoke/qtmultimedia/libsmokeqtmultimedia.* lib/#{ruby_version}"
@@ -289,6 +242,7 @@ File.open('Makefile', 'w') do |file|
289
242
  file.puts "\t-cp ext/build/smoke/qtxmlpatterns/libsmokeqtxmlpatterns.* lib/#{ruby_version}"
290
243
  file.puts "\t-cp ext/build/smoke/smokeapi/smokeapi bin/#{ruby_version}"
291
244
  file.puts "\t-cp ext/build/smoke/smokebase/libsmokebase.* lib/#{ruby_version}"
245
+ file.puts "\t-cp ext/build/ruby/qtdeclarative/qtdeclarative.* lib/#{ruby_version}"
292
246
  file.puts "\t-cp ext/build/ruby/qtruby/src/libqtruby4shared.* lib/#{ruby_version}"
293
247
  file.puts "\t-cp ext/build/ruby/qtruby/src/qtruby4.* lib/#{ruby_version}"
294
248
  file.puts "\t-cp ext/build/ruby/qtscript/qtscript.* lib/#{ruby_version}"