From c6f5a933316afcf8a7992b2d8e667dbce982ef59 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 7 Dec 2016 16:02:40 -0200 Subject: [PATCH] Ajustes para empacotamento --- .gitignore | 1 + configure.ac | 4 +++- pw3270-sharp.spec | 4 ++++ src/native/Makefile.in | 4 ++++ src/pw3270-sharp/Makefile.in | 28 ++++++++++++++++++++++++---- src/pw3270-sharp/pw3270-sharp.pc.in | 11 +++++++++++ 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 src/pw3270-sharp/pw3270-sharp.pc.in diff --git a/.gitignore b/.gitignore index 4f7be27..185e03b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ stamp-h1 *.tar *.bz2 rpm +*.pc diff --git a/configure.ac b/configure.ac index c61f0b1..bc7f641 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,8 @@ AC_PATH_TOOL([VALGRIND], [valgrind], [no]) AC_PATH_TOOL([WINDRES], [windres], [no]) AC_PATH_TOOL([ZIP], [zip], [zip]) AC_PATH_TOOL([MCS], [mcs], [mcs]) - +AC_PATH_TOOL([GACUTIL], [gacutil], [gacutil]) +AC_PATH_TOOL([SN], [sn], [sn]) AC_PATH_PROG([MONO], [mono], [no]) dnl --------------------------------------------------------------------------- @@ -333,6 +334,7 @@ dnl --------------------------------------------------------------------------- AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(src/native/Makefile) AC_CONFIG_FILES(src/pw3270-sharp/Makefile) +AC_CONFIG_FILES(src/pw3270-sharp/pw3270-sharp.pc) dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. diff --git a/pw3270-sharp.spec b/pw3270-sharp.spec index 56bc142..1303b7e 100644 --- a/pw3270-sharp.spec +++ b/pw3270-sharp.spec @@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_libdir}/lib3270-mono.* +/usr/lib/mono/gac/%{name} +/usr/share/gapi-2.0/%{name}/%{name}.xml +%{_libdir}/pkgconfig/%{name}.pc +/usr/lib/mono/%{name}-%{version} %changelog diff --git a/src/native/Makefile.in b/src/native/Makefile.in index 635b71f..ed9f169 100644 --- a/src/native/Makefile.in +++ b/src/native/Makefile.in @@ -107,6 +107,10 @@ install: \ @$(MKDIR) $(DESTDIR)/$(libdir) @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir) + + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME) + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME) diff --git a/src/pw3270-sharp/Makefile.in b/src/pw3270-sharp/Makefile.in index 9435917..21b3205 100644 --- a/src/pw3270-sharp/Makefile.in +++ b/src/pw3270-sharp/Makefile.in @@ -24,8 +24,10 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # -SOURCES=pw3270-sharp.cs -LIBNAME=pw3270-sharp.dll +MODULE_NAME=pw3270-sharp + +SOURCES=$(MODULE_NAME).cs +LIBNAME=$(MODULE_NAME).dll #---[ Configuration values ]------------------------------------------------------------- @@ -58,6 +60,8 @@ LN_S=@LN_S@ MCS=@MCS@ MKDIR=@MKDIR_P@ +GACUTIL=@GACUTIL@ +SN=@SN@ #---[ Targets ]-------------------------------------------------------------------------- @@ -70,9 +74,24 @@ Release: \ install: \ $(BINRLS)/$(LIBNAME) + @$(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)/usr/lib + + @$(MKDIR) $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME) + @$(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME) + + @$(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + + @$(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig + @$(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig + Debug: \ $(BINDBG)/$(LIBNAME) +$(BINRLS)/$(MODULE_NAME).key: + + @$(SN) -k $@ + $(BINDBG)/$(LIBNAME): \ $(SOURCES) @@ -80,9 +99,10 @@ $(BINDBG)/$(LIBNAME): \ @$(MCS) -debug -target:library -out:$@ $< $(BINRLS)/$(LIBNAME): \ - $(SOURCES) + $(SOURCES) \ + $(BINRLS)/$(MODULE_NAME).key @$(MKDIR) `dirname $@` - @$(MCS) -doc:$(basename $@).xml -target:library -out:$@ $< + @$(MCS) -doc:$(BINRLS)/$(MODULE_NAME).xml -keyfile:$(BINRLS)/$(MODULE_NAME).key -target:library -out:$@ $(SOURCES) diff --git a/src/pw3270-sharp/pw3270-sharp.pc.in b/src/pw3270-sharp/pw3270-sharp.pc.in new file mode 100644 index 0000000..233ebc4 --- /dev/null +++ b/src/pw3270-sharp/pw3270-sharp.pc.in @@ -0,0 +1,11 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +gapidir=${prefix}/share/pw3270-sharp-1.0 + + +Name: pw3270-sharp +Description: Mono Bindings for pw3270 +Version: @PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ +Cflags: -I:${gapidir}/pw3270-sharp.xml +Libs: -r:${libdir}/mono/pw3270-sharp-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@/pw3270-sharp.dll -- libgit2 0.21.2