Rakefiles: removed tasks to build VOGL
...as recent `stx:libview` uses only OpenGL.
--- a/rakelib/compile.rake Thu Sep 14 12:52:32 2017 +0100
+++ b/rakelib/compile.rake Thu Sep 14 12:53:47 2017 +0100
@@ -13,11 +13,11 @@
LIBRUN = STX_TOP_DIR / 'librun' / 'librun.so'
end
-# Return true if stx:stc and stx:librun sources should be removed as soon
-# as STC or librun is built. False otherwise (sources are not removed by
+# Return true if stx:stc and stx:librun sources should be removed as soon
+# as STC or librun is built. False otherwise (sources are not removed by
# rakefiles)
#
-# Indeed this is a feeble protection as it's easy to trick this method. But
+# Indeed this is a feeble protection as it's easy to trick this method. But
# the goal is not to protect sources but rather have a secondaty measure to
# avoid sources to leak (for exaple, due to a bug in packaging scripts).
# Unathorized subjects should not be able to checkout sources in first instance.
@@ -25,8 +25,8 @@
!(core_developer? or ENV['RETAIN_STX_AND_LIBRUN_SOURCE'] == 'yespleaseretain!')
end
-STC_BINARY_FILES = [
- 'cpu_arm.h',
+STC_BINARY_FILES = [
+ 'cpu_arm.h',
'cpu_i386.h',
'cpu_x86_64.h',
'cpu_ia64.h',
@@ -61,7 +61,7 @@
'Make.proto',
'stc.exe',
]
-
+
LIBRUN_BINARY_FILES = [
'libffi-3.2.1',
'md5.h',
@@ -84,7 +84,7 @@
'genDate.com',
File.join('objmingw' , 'librun.dll'),
File.join('objmingw' , 'librun.lib'),
-]
+]
def cleanup_stc
if should_remove_librun_and_stc_sources
@@ -121,7 +121,6 @@
task :main => %i(
config
- libraries
stc
librun
application
@@ -136,16 +135,16 @@
task :config => [ STX_CONF_DIR / 'stx-config.make' ]
- directory STX_CONF_DIR do
+ directory STX_CONF_DIR do
mkdir_p STX_CONF_DIR
end
-
+
file STX_CONF_DIR / 'stx-config.make' => STX_CONF_DIR do
makelib_dir = Pathname.new(File.expand_path('makelib')).relative_path_from(Pathname.new(BUILD_DIR / 'stx' ))
File.open(STX_CONF_DIR / 'stx-config.make', 'w') do | f |
f.puts "BUILD_TARGET ?= #{BUILD_TARGET}"
end
- end
+ end
rule 'makefile' do |t|
chdir File.dirname(t.name) do
@@ -181,7 +180,7 @@
if win32_wine?
(mkdir 'libffi' / 'build_win32' / 'objbc') unless File.exist?('libffi' / 'build_win32' / 'objbc')
end
- # A workaround for Windows 10 & ancient Borland make which
+ # A workaround for Windows 10 & ancient Borland make which
# tend to crash there when trying to recompile already compiled
# librun. Sigh, we have to move away from it as soon as possible!
(touch 'stxmain.c') if (win32? and File.exist? 'stxmain.c')
@@ -205,18 +204,6 @@
directory STX_TOP_DIR / 'lib' / 'bc'
task :librun => STX_TOP_DIR / 'lib' / 'bc'
end
-
- task :'libraries'
-
- if unix?
- vogl_dir = STX_TOP_DIR / 'support' / 'VGL' / 'vogl'
-
- task 'libraries' => [vogl_dir / 'src' / 'libvogl.a']
-
- file vogl_dir / 'src' / 'libvogl.a' => [vogl_dir / 'makefile'] do
- chdir STX_TOP_DIR / 'support' / 'VGL' / 'vogl' do; make; end
- end
- end
end
@@ -224,9 +211,9 @@
#
# Various compilation hacks here and there (sigh)
-#
+#
desc "Update the VM symbol database"
-task 'stx:librun:symbols' do | task |
+task 'stx:librun:symbols' do | task |
symbols_stc = BUILD_DIR / 'stx' / 'include' / 'symbols.stc'
if unix?
# UNIX VMs have the symbol database built into the binary as
@@ -238,7 +225,7 @@
Rake::Task["stx:librun"].reenable()
Rake::Task["stx:librun"].invoke()
end
- elsif win32?
+ elsif win32?
# Windows VM reads the symbol database from a file `symbols.stc` located
# alongside the program executable so we need to copy that file
app = project.application
@@ -253,9 +240,9 @@
if unix?
# A hack for Debian (and possibly other Linux distros) that does not ship
# 32bit libodbc.a / libodbcinst.a. Link directly against .so
- task :'stx:libdb/libodbc:pre' do
+ task :'stx:libdb/libodbc:pre' do
sed('-lodbc -lodbcinst' , '-l:libodbc.so.2 -l:libodbcinst.so.2', BUILD_DIR / 'stx' / 'libdb' / 'libodbc' / 'Make.proto', true)
- end
+ end
end