Download as
Browse Code »

Commit c6f5a933316afcf8a7992b2d8e667dbce982ef59

Authored by Perry Werneck
1 parent c1e017dd
Exists in master

Ajustes para empacotamento

Showing 6 changed files with 47 additions and 5 deletions   Show diff stats
.gitignore
  Diff comments   View file @c6f5a93
... ... @@ -16,3 +16,4 @@ stamp-h1
16 16 *.tar
17 17 *.bz2
18 18 rpm
  19 +*.pc
... ...
configure.ac
  Diff comments   View file @c6f5a93
... ... @@ -116,7 +116,8 @@ AC_PATH_TOOL([VALGRIND], [valgrind], [no])
116 116 AC_PATH_TOOL([WINDRES], [windres], [no])
117 117 AC_PATH_TOOL([ZIP], [zip], [zip])
118 118 AC_PATH_TOOL([MCS], [mcs], [mcs])
119   -
  119 +AC_PATH_TOOL([GACUTIL], [gacutil], [gacutil])
  120 +AC_PATH_TOOL([SN], [sn], [sn])
120 121 AC_PATH_PROG([MONO], [mono], [no])
121 122  
122 123 dnl ---------------------------------------------------------------------------
... ... @@ -333,6 +334,7 @@ dnl ---------------------------------------------------------------------------
333 334 AC_CONFIG_FILES(Makefile)
334 335 AC_CONFIG_FILES(src/native/Makefile)
335 336 AC_CONFIG_FILES(src/pw3270-sharp/Makefile)
  337 +AC_CONFIG_FILES(src/pw3270-sharp/pw3270-sharp.pc)
336 338  
337 339 dnl ---------------------------------------------------------------------------
338 340 dnl Output the generated config.status script.
... ...
pw3270-sharp.spec
  Diff comments   View file @c6f5a93
... ... @@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
54 54 %files
55 55 %defattr(-,root,root)
56 56 %{_libdir}/lib3270-mono.*
  57 +/usr/lib/mono/gac/%{name}
  58 +/usr/share/gapi-2.0/%{name}/%{name}.xml
  59 +%{_libdir}/pkgconfig/%{name}.pc
  60 +/usr/lib/mono/%{name}-%{version}
57 61  
58 62 %changelog
59 63  
... ...
src/native/Makefile.in
  Diff comments   View file @c6f5a93
... ... @@ -107,6 +107,10 @@ install: \
107 107  
108 108 @$(MKDIR) $(DESTDIR)/$(libdir)
109 109 @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir)
  110 +
  111 + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  112 + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME)
  113 +
110 114 @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
111 115 @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME)
112 116  
... ...
src/pw3270-sharp/Makefile.in
  Diff comments   View file @c6f5a93
... ... @@ -24,8 +24,10 @@
24 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 25 #
26 26  
27   -SOURCES=pw3270-sharp.cs
28   -LIBNAME=pw3270-sharp.dll
  27 +MODULE_NAME=pw3270-sharp
  28 +
  29 +SOURCES=$(MODULE_NAME).cs
  30 +LIBNAME=$(MODULE_NAME).dll
29 31  
30 32 #---[ Configuration values ]-------------------------------------------------------------
31 33  
... ... @@ -58,6 +60,8 @@ LN_S=@LN_S@
58 60  
59 61 MCS=@MCS@
60 62 MKDIR=@MKDIR_P@
  63 +GACUTIL=@GACUTIL@
  64 +SN=@SN@
61 65  
62 66 #---[ Targets ]--------------------------------------------------------------------------
63 67  
... ... @@ -70,9 +74,24 @@ Release: \
70 74 install: \
71 75 $(BINRLS)/$(LIBNAME)
72 76  
  77 + @$(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)/usr/lib
  78 +
  79 + @$(MKDIR) $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME)
  80 + @$(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME)
  81 +
  82 + @$(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  83 + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  84 +
  85 + @$(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig
  86 + @$(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig
  87 +
73 88 Debug: \
74 89 $(BINDBG)/$(LIBNAME)
75 90  
  91 +$(BINRLS)/$(MODULE_NAME).key:
  92 +
  93 + @$(SN) -k $@
  94 +
76 95 $(BINDBG)/$(LIBNAME): \
77 96 $(SOURCES)
78 97  
... ... @@ -80,9 +99,10 @@ $(BINDBG)/$(LIBNAME): \
80 99 @$(MCS) -debug -target:library -out:$@ $<
81 100  
82 101 $(BINRLS)/$(LIBNAME): \
83   - $(SOURCES)
  102 + $(SOURCES) \
  103 + $(BINRLS)/$(MODULE_NAME).key
84 104  
85 105 @$(MKDIR) `dirname $@`
86   - @$(MCS) -doc:$(basename $@).xml -target:library -out:$@ $<
  106 + @$(MCS) -doc:$(BINRLS)/$(MODULE_NAME).xml -keyfile:$(BINRLS)/$(MODULE_NAME).key -target:library -out:$@ $(SOURCES)
87 107  
88 108  
... ...
src/pw3270-sharp/pw3270-sharp.pc.in 0 → 100644
  Diff comments   View file @c6f5a93
... ... @@ -0,0 +1,11 @@
  1 +prefix=${pcfiledir}/../..
  2 +exec_prefix=${prefix}
  3 +libdir=${exec_prefix}/lib
  4 +gapidir=${prefix}/share/pw3270-sharp-1.0
  5 +
  6 +
  7 +Name: pw3270-sharp
  8 +Description: Mono Bindings for pw3270
  9 +Version: @PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  10 +Cflags: -I:${gapidir}/pw3270-sharp.xml
  11 +Libs: -r:${libdir}/mono/pw3270-sharp-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@/pw3270-sharp.dll
... ...