We generate the BS file in the common build dir now. Also no need to pattern-search since we know the path of the file.

This commit is contained in:
Mark Villacampa
2015-03-05 23:41:47 +01:00
committed by Watson
parent a07b27204f
commit 509cb5106f

View File

@@ -2,16 +2,16 @@
# Copyright (c) 2012, HipByte SPRL and contributors
# All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -222,7 +222,7 @@ EOS
@config.gen_bridge_metadata(platform, headers, bs_file, bs_cflags, bs_exceptions)
end
end
@bs_files = Dir.glob("#{build_dir}/*.bridgesupport").map { |x| File.expand_path(x) }
@bs_files << bs_file
end
private