summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Jr <larry.olj@gmail.com>2015-05-15 17:10:47 -0300
committerLarry Jr <larry.olj@gmail.com>2015-05-20 15:58:18 -0300
commita44f3c0818c611c3b933aa7494b28891aa699a7e (patch)
tree1b970fae59951330e2b4d78e236f842b502f325d
parent5167399c16a897f49d15a51eae83bb4016ee9f9f (diff)
changes to correct build in Tizen platformdevs/felipealmeida/emodel_tizen
-rw-r--r--.gbs.conf13
-rw-r--r--packaging/efl.spec1
-rw-r--r--pc/emodel-cxx.pc.in12
-rw-r--r--pc/emodel.pc.in12
-rw-r--r--pkgbuild/PKGBUILD2
-rw-r--r--src/Makefile_Efl.am3
-rw-r--r--src/Makefile_Efl_Cxx.am8
-rw-r--r--src/Makefile_Eio.am3
-rw-r--r--src/bin/eolian_cxx/type_lookup_table.cc2
-rw-r--r--src/examples/eio/Makefile.am2
10 files changed, 19 insertions, 39 deletions
diff --git a/.gbs.conf b/.gbs.conf
index 2290232b08..163903241a 100644
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -1,3 +1,16 @@
1[general] 1[general]
2upstream_branch = upstream 2upstream_branch = upstream
3upstream_tag = v${upstreamversion} 3upstream_tag = v${upstreamversion}
4
5tmpdir=/var/tmp/
6profile = profile.tizen3.0_common
7work_dir=.
8
9[repo.tizen3]
10url=http://download.tizen.org/releases/milestone/tizen/common-3.0.2015.Q1/tizen-3.0.2015.Q1-common_20150331.1/repos/x86_64-wayland/packages/
11#url=http://download.tizen.org/snapshots/tizen/common/latest/repos/x86_64-wayland/packages/
12
13[profile.tizen3.0_common]
14repos=repo.tizen3
15#buildconf=${work_dir}/scm/meta/build-config/build.conf
16
diff --git a/packaging/efl.spec b/packaging/efl.spec
index 2fef807c1d..fd2fd57002 100644
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -904,6 +904,7 @@ grep --silent ECORE_IMF_MODULE "$f" \
904%manifest %{name}.manifest 904%manifest %{name}.manifest
905%defattr(-,root,root,-) 905%defattr(-,root,root,-)
906%{_includedir}/eio-1/* 906%{_includedir}/eio-1/*
907%{_includedir}/eio-cxx-1/*
907%{_libdir}/libeio.so 908%{_libdir}/libeio.so
908%{_libdir}/pkgconfig/eio*.pc 909%{_libdir}/pkgconfig/eio*.pc
909 910
diff --git a/pc/emodel-cxx.pc.in b/pc/emodel-cxx.pc.in
deleted file mode 100644
index dce37642ad..0000000000
--- a/pc/emodel-cxx.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: emodel C++ API
7Description: MVC Library C++ API.
8Version: @PACKAGE_VERSION@
9Requires.private: @requirements_pc_emodel@
10Libs: -L${libdir} -lemodel
11Libs.private: @requirements_libs_emodel@
12Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/emodel-@VMAJ@ -I${includedir}/emodel-cxx-@VMAJ@
diff --git a/pc/emodel.pc.in b/pc/emodel.pc.in
deleted file mode 100644
index 0d68f11152..0000000000
--- a/pc/emodel.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: emodel
7Description: MVC Library
8Version: @PACKAGE_VERSION@
9Requires.private: @requirements_pc_emodel@
10Libs: -L${libdir} -lemodel
11Libs.private: @requirements_libs_emodel@
12Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/emodel-@VMAJ@
diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD
index 6a17c0b951..afa8ae2d7d 100644
--- a/pkgbuild/PKGBUILD
+++ b/pkgbuild/PKGBUILD
@@ -60,7 +60,7 @@ build() {
60package_efl() { 60package_efl() {
61 provides+=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver" 61 provides+=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver"
62 "eet=$pkgver" "eeze=$pkgver" "efreet=$pkgver" 62 "eet=$pkgver" "eeze=$pkgver" "efreet=$pkgver"
63 "eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver" "emodel=$pkgver" 63 "eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver"
64 "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver") 64 "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver")
65 conflicts+=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion' 65 conflicts+=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
66 'ethumb' 'evas') 66 'ethumb' 'evas')
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 709a5ee83e..fa9153416a 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -39,7 +39,8 @@ lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
39installed_eflheadersdir = $(includedir)/efl-@VMAJ@ 39installed_eflheadersdir = $(includedir)/efl-@VMAJ@
40dist_installed_eflheaders_DATA = \ 40dist_installed_eflheaders_DATA = \
41 lib/efl/Efl_Config.h \ 41 lib/efl/Efl_Config.h \
42 lib/efl/Efl.h 42 lib/efl/Efl.h \
43 lib/efl/Efl_Model_Common.h
43 44
44installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces 45installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
45nodist_installed_eflinterfaces_DATA = $(efl_eolian_files_h) 46nodist_installed_eflinterfaces_DATA = $(efl_eolian_files_h)
diff --git a/src/Makefile_Efl_Cxx.am b/src/Makefile_Efl_Cxx.am
index 538d4beda1..6721506183 100644
--- a/src/Makefile_Efl_Cxx.am
+++ b/src/Makefile_Efl_Cxx.am
@@ -2,13 +2,7 @@ if HAVE_CXX11
2 2
3### Generated headers 3### Generated headers
4 4
5generated_efl_cxx_bindings = \ 5generated_efl_cxx_bindings = $(efl_eolian_files:%.eo=%.eo.hh)
6 lib/efl/interfaces/efl_control.eo.hh \
7 lib/efl/interfaces/efl_file.eo.hh \
8 lib/efl/interfaces/efl_image.eo.hh \
9 lib/efl/interfaces/efl_player.eo.hh \
10 lib/efl/interfaces/efl_text.eo.hh \
11 lib/efl/interfaces/efl_text_properties.eo.hh
12 6
13lib/efl/Efl.hh: $(generated_efl_cxx_bindings) 7lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
14 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh 8 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 531d285a37..c5296136b1 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -46,9 +46,6 @@ lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@ @EFL_CFL
46lib_eio_libeio_la_LIBADD = @EIO_LIBS@ @EFL_LIBS@ 46lib_eio_libeio_la_LIBADD = @EIO_LIBS@ @EFL_LIBS@
47lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@ 47lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
48lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 48lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
49if HAVE_NOTIFY_COCOA
50lib_eio_libeio_la_LDFLAGS += -framework CoreServices
51endif
52 49
53if EFL_ENABLE_TESTS 50if EFL_ENABLE_TESTS
54 51
diff --git a/src/bin/eolian_cxx/type_lookup_table.cc b/src/bin/eolian_cxx/type_lookup_table.cc
index 7fa085e9ba..0c682d950e 100644
--- a/src/bin/eolian_cxx/type_lookup_table.cc
+++ b/src/bin/eolian_cxx/type_lookup_table.cc
@@ -23,7 +23,7 @@ type_lookup_table
23 {"Eina_List *", eolian_type::complex_, false, true, true, "::efl::eina::list", {"eina-cxx/eina_list.hh"}}, 23 {"Eina_List *", eolian_type::complex_, false, true, true, "::efl::eina::list", {"eina-cxx/eina_list.hh"}},
24 {"const Eina_List *", eolian_type::complex_, true, false, true, "::efl::eina::crange_list", {"eina-cxx/eina_list.hh"}}, 24 {"const Eina_List *", eolian_type::complex_, true, false, true, "::efl::eina::crange_list", {"eina-cxx/eina_list.hh"}},
25 {"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}}, 25 {"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}},
26 {"Emodel *", eolian_type::simple_, false, false, true, "::emodel", {"Emodel.hh"}}, 26 {"Efl_Model_Base *", eolian_type::simple_, false, false, true, "::efl::model::base", {"Efl.hh"}},
27 {"Eo *", eolian_type::simple_, false, true, true, "::efl::eo::concrete", {"eo_concrete.hh"}}, 27 {"Eo *", eolian_type::simple_, false, true, true, "::efl::eo::concrete", {"eo_concrete.hh"}},
28 {"Eo *", eolian_type::simple_, false, false, true, "::efl::eo::concrete", {"eo_concrete.hh"}}, 28 {"Eo *", eolian_type::simple_, false, false, true, "::efl::eo::concrete", {"eo_concrete.hh"}},
29 //{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}}, 29 //{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}},
diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am
index ed07ea291e..9754369396 100644
--- a/src/examples/eio/Makefile.am
+++ b/src/examples/eio/Makefile.am
@@ -20,7 +20,6 @@ eio_file_copy
20eio_file_ls_SOURCES = eio_file_ls.c 20eio_file_ls_SOURCES = eio_file_ls.c
21eio_file_ls_LDADD = \ 21eio_file_ls_LDADD = \
22$(top_builddir)/src/lib/eio/libeio.la \ 22$(top_builddir)/src/lib/eio/libeio.la \
23$(top_builddir)/src/lib/emodel/libemodel.la \
24$(top_builddir)/src/lib/eo/libeo.la \ 23$(top_builddir)/src/lib/eo/libeo.la \
25$(top_builddir)/src/lib/ecore/libecore.la \ 24$(top_builddir)/src/lib/ecore/libecore.la \
26$(top_builddir)/src/lib/eet/libeet.la \ 25$(top_builddir)/src/lib/eet/libeet.la \
@@ -30,7 +29,6 @@ $(top_builddir)/src/lib/eina/libeina.la \
30eio_file_copy_SOURCES = eio_file_copy.c 29eio_file_copy_SOURCES = eio_file_copy.c
31eio_file_copy_LDADD = \ 30eio_file_copy_LDADD = \
32$(top_builddir)/src/lib/eio/libeio.la \ 31$(top_builddir)/src/lib/eio/libeio.la \
33$(top_builddir)/src/lib/emodel/libemodel.la \
34$(top_builddir)/src/lib/eo/libeo.la \ 32$(top_builddir)/src/lib/eo/libeo.la \
35$(top_builddir)/src/lib/ecore/libecore.la \ 33$(top_builddir)/src/lib/ecore/libecore.la \
36$(top_builddir)/src/lib/eet/libeet.la \ 34$(top_builddir)/src/lib/eet/libeet.la \