ignatenkobrain pushed to angelscript (master). "simplify buildsystem (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 21 13:07:27 UTC 2015
From aa6d88b8eb3f5dbb1806ea0a1868e585388f9b13 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Thu, 21 May 2015 16:07:15 +0300
Subject: simplify buildsystem
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
diff --git a/angelscript-meson.build b/angelscript-meson.build
index 8f4a601..8604b82 100644
--- a/angelscript-meson.build
+++ b/angelscript-meson.build
@@ -1,5 +1,58 @@
project('angelscript', 'cpp', 'c')
arch = run_command('uname', '-p').stdout().strip()
-subdir('source')
+
+srcs = [
+ 'source/as_atomic.cpp',
+ 'source/as_builder.cpp',
+ 'source/as_bytecode.cpp',
+ 'source/as_callfunc.cpp',
+ 'source/as_callfunc_arm.cpp',
+ 'source/as_callfunc_mips.cpp',
+ 'source/as_callfunc_ppc.cpp',
+ 'source/as_callfunc_ppc_64.cpp',
+ 'source/as_callfunc_sh4.cpp',
+ 'source/as_callfunc_x86.cpp',
+ 'source/as_callfunc_x64_gcc.cpp',
+ 'source/as_callfunc_x64_mingw.cpp',
+ 'source/as_compiler.cpp',
+ 'source/as_context.cpp',
+ 'source/as_configgroup.cpp',
+ 'source/as_datatype.cpp',
+ 'source/as_generic.cpp',
+ 'source/as_gc.cpp',
+ 'source/as_globalproperty.cpp',
+ 'source/as_memory.cpp',
+ 'source/as_module.cpp',
+ 'source/as_objecttype.cpp',
+ 'source/as_outputbuffer.cpp',
+ 'source/as_parser.cpp',
+ 'source/as_restore.cpp',
+ 'source/as_scriptcode.cpp',
+ 'source/as_scriptengine.cpp',
+ 'source/as_scriptfunction.cpp',
+ 'source/as_scriptnode.cpp',
+ 'source/as_scriptobject.cpp',
+ 'source/as_string.cpp',
+ 'source/as_string_util.cpp',
+ 'source/as_thread.cpp',
+ 'source/as_tokenizer.cpp',
+ 'source/as_typeinfo.cpp',
+ 'source/as_variablescope.cpp',
+]
+if arch == 'armv7l'
+ srcs = srcs + [
+ 'source/as_callfunc_arm.cpp',
+ 'source/as_callfunc_arm_gcc.S'
+ ]
+endif
+
+shared_library(
+ 'angelscript',
+ sources : srcs,
+ install : true,
+ soversion : '0',
+ version : '2.30.0',
+)
+
install_headers('include/angelscript.h')
diff --git a/angelscript-source-meson.build b/angelscript-source-meson.build
deleted file mode 100644
index 72b916a..0000000
--- a/angelscript-source-meson.build
+++ /dev/null
@@ -1,58 +0,0 @@
-srcs = [
- 'as_atomic.cpp',
- 'as_builder.cpp',
- 'as_bytecode.cpp',
- 'as_callfunc.cpp',
- 'as_callfunc_arm.cpp',
- 'as_callfunc_mips.cpp',
- 'as_callfunc_ppc.cpp',
- 'as_callfunc_ppc_64.cpp',
- 'as_callfunc_sh4.cpp',
- 'as_callfunc_x86.cpp',
- 'as_callfunc_x64_gcc.cpp',
- 'as_callfunc_x64_mingw.cpp',
- 'as_compiler.cpp',
- 'as_context.cpp',
- 'as_configgroup.cpp',
- 'as_datatype.cpp',
- 'as_generic.cpp',
- 'as_gc.cpp',
- 'as_globalproperty.cpp',
- 'as_memory.cpp',
- 'as_module.cpp',
- 'as_objecttype.cpp',
- 'as_outputbuffer.cpp',
- 'as_parser.cpp',
- 'as_restore.cpp',
- 'as_scriptcode.cpp',
- 'as_scriptengine.cpp',
- 'as_scriptfunction.cpp',
- 'as_scriptnode.cpp',
- 'as_scriptobject.cpp',
- 'as_string.cpp',
- 'as_string_util.cpp',
- 'as_thread.cpp',
- 'as_tokenizer.cpp',
- 'as_typeinfo.cpp',
- 'as_variablescope.cpp',
-]
-
-if arch == 'armv7l'
- srcs = srcs + ['as_callfunc_arm.cpp']
- lib = shared_library(
- 'as_callfunc_arm_gcc',
- sources : 'as_callfunc_arm_gcc.S'
- )
- obj = lib.extract_objects('as_callfunc_arm_gcc.S')
-else
- obj = []
-endif
-
-shared_library(
- 'angelscript',
- sources : srcs,
- objects : obj,
- install : true,
- soversion : '0',
- version : '2.30.0',
-)
diff --git a/angelscript.spec b/angelscript.spec
index 3aea6b6..0a3a985 100644
--- a/angelscript.spec
+++ b/angelscript.spec
@@ -1,16 +1,14 @@
Name: angelscript
Version: 2.30.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Flexible cross-platform scripting library
License: zlib
URL: http://www.angelcode.com/angelscript/
Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip
Source1: angelscript-meson.build
-Source2: angelscript-source-meson.build
BuildRequires: meson >= 0.23.0-3
-BuildRequires: chrpath
%description
The AngelScript library is a software library for easy integration of
@@ -32,7 +30,6 @@ developing applications that use %{name}.
%setup -q -c
rm -rf build && mkdir build
cp %{SOURCE1} sdk/%{name}/meson.build
-cp %{SOURCE2} sdk/%{name}/source/meson.build
%build
pushd build
@@ -60,6 +57,9 @@ chrpath -d %{buildroot}%{_libdir}/*
%{_includedir}/%{name}.h
%changelog
+* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.30.0-6
+- Simplify buildsystem
+
* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.30.0-5
- arm build fixes
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/angelscript.git/commit/?h=master&id=aa6d88b8eb3f5dbb1806ea0a1868e585388f9b13
More information about the scm-commits
mailing list