[Pkg-privacy-commits] [pidgin-otr] 14/14: * INSTALL: Fixing typo and updating reference to CVS. * Makefile.mingw, packaging/windows/pidgin-otr.nsi: Updating to support building the win32 installer on GNU/Linux.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 12:52:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to tag release_3_2_1
in repository pidgin-otr.
commit 50e71bb83cbe13052c15561feb7378a91102dd67
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date: Mon May 14 12:33:33 2012 -0400
* INSTALL: Fixing typo and updating reference to CVS.
* Makefile.mingw, packaging/windows/pidgin-otr.nsi:
Updating to support building the win32 installer on
GNU/Linux.
---
ChangeLog | 7 +++++++
INSTALL | 2 +-
Makefile.mingw | 45 ++++++++++++++++++++++++++++++++--------
packaging/windows/pidgin-otr.nsi | 36 ++++++++++++++++----------------
4 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 66a7b9e..3a16b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-14
+
+ * INSTALL: Fixing typo and updating reference to CVS.
+ * Makefile.mingw, packaging/windows/pidgin-otr.nsi:
+ Updating to support building the win32 installer on
+ GNU/Linux.
+
2012-05-12
* otr-plugin.c: Fixing a format string vulnerability.
diff --git a/INSTALL b/INSTALL
index 7c4aacc..f44c3b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,7 @@ If you install these with a package manager, you'll probably need the
COMPILING (non-Win32)
-If you're got a CVS copy, you will need to regenerate the configure
+If you've got a git copy, you will need to regenerate the configure
script using:
intltoolize --force --copy
diff --git a/Makefile.mingw b/Makefile.mingw
index 94a9698..f4e4ca4 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -7,11 +7,29 @@ PIDGIN_OTR_VERSION = 3.2.1
GETTEXT_PACKAGE = pidgin-otr
# Replace this with the path to the pidgin and purple headers
-PIDGIN_HEADERS ?= /usr/i586-mingw32msvc/include/pidgin
-PURPLE_HEADERS ?= /usr/i586-mingw32msvc/include/libpurple
+PIDGIN_HEADERS ?= -I/usr/i586-mingw32msvc/include/pidgin \
+ -I/usr/i586-mingw32msvc/include/pidgin/win32
+PURPLE_HEADERS ?= -I/usr/i586-mingw32msvc/include/libpurple \
+ -I/usr/i586-mingw32msvc/include/libpurple/win32
-# If you don't have pkg-config, put the appropriate -I entry on the next line
+# Replace this with the path to the extracted GTK+ "all-in-one" win32 bundle
+GTK_WIN32_BUNDLE ?= /usr/i586-mingw32msvc/misc/gtk_bundle
+
+# Replace this with the to path DLL files from a Win32 Pidgin distributable
+# (i.e. pidgin.dll and libpurple.dll)
+PIDGIN_WIN32_LIBS ?= /usr/i586-mingw32msvc/misc/pidgin_dlls
+
+# If you don't have pkg-config, uncomment the -I lines below
GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
+#GTK_HDRS ?= -I$(GTK_WIN32_BUNDLE)/include/gtk-2.0 \
+# -I$(GTK_WIN32_BUNDLE)/include/glib-2.0 \
+# -I$(GTK_WIN32_BUNDLE)/include/cairo \
+# -I$(GTK_WIN32_BUNDLE)/include/pango-1.0 \
+# -I$(GTK_WIN32_BUNDLE)/include/atk-1.0 \
+# -I$(GTK_WIN32_BUNDLE)/include/gdk-pixbuf-2.0 \
+# -I$(GTK_WIN32_BUNDLE)/lib/glib-2.0/include \
+# -I$(GTK_WIN32_BUNDLE)/lib/gtk-2.0/include
+
# The location of the libotr include files. Note that if, for example,
# the full path of message.h is /usr/include/libotr/message.h, you
@@ -41,12 +59,13 @@ ZIPFILE = pidgin-otr-$(PIDGIN_OTR_VERSION).zip
CC = i586-mingw32msvc-gcc
LDFLAGS = -Wl,--enable-auto-image-base
-LDLIBS = $(LIBOTRLIBDIR)/libotr.a -lgtk-win32-2.0 -lglib-2.0 -lgdk_pixbuf-2.0 \
- -lgobject-2.0 -lpidgin -llibpurple -lgcrypt -lgpg-error \
- -L$(LIBINTLLIBDIR) -lintl
+LDLIBS = $(LIBOTRLIBDIR)/libotr.a -L$(GTK_WIN32_BUNDLE)/lib \
+ -L$(PIDGIN_WIN32_LIBS) -lgtk-win32-2.0 -lglib-2.0 \
+ -lgdk_pixbuf-2.0 -lgobject-2.0 -lpidgin -llibpurple \
+ -lgcrypt -lgpg-error -L$(LIBINTLLIBDIR) -lintl
CC ?= gcc
-override CFLAGS += -g -O2 -Wall -I$(PIDGIN_HEADERS) -I$(PURPLE_HEADERS) \
+override CFLAGS += -g -O2 -Wall $(PIDGIN_HEADERS) $(PURPLE_HEADERS) \
$(GTK_HDRS) -I$(LIBOTRINCDIR) $(FPIC) -DUSING_GTK -DPURPLE_PLUGINS \
-DPIDGIN_OTR_VERSION=\"$(PIDGIN_OTR_VERSION)\" \
-DPIDGIN_NAME=\"Pidgin\" -I$(LIBINTLINCDIR) -DENABLE_NLS \
@@ -66,8 +85,8 @@ clean:
distclean: clean
$(MAKE) -C po -f Makefile.mingw distclean
-## Package up all the pieces needed to build the installer
-zip: all
+## Prepare the win32_export directory
+prepare_win32_export: all
mkdir win32_export
# Copy pieces over from the libotr source dir
for f in otr_mackey.exe otr_parse.exe otr_remac.exe otr_modify.exe \
@@ -90,8 +109,16 @@ zip: all
i586-mingw32msvc-strip *.exe *.dll; \
perl -pi -e 's/$$/\r/' README.Toolkit.txt Protocol-v2.html \
COPYING.txt COPYING.LIB.txt README.txt; \
+
+installer: prepare_win32_export
+ makensis packaging/windows/pidgin-otr.nsi
+ rm -rf win32_export
+
+## Package up all the pieces needed to build the installer
+zip: prepare_win32_export
rm -f ../$(ZIPFILE); \
zip -r ../$(ZIPFILE) README.txt \
README.Toolkit.txt Protocol-v2.html COPYING.txt \
COPYING.LIB.txt *.exe *.dll *.nsi locale
rm -rf win32_export
+
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index e617faf..3c2ac17 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -3,7 +3,7 @@
;
; known issue. installer induced uninstaller abortion causes overwrite
; by installer without uninstall.
-; v3.2.1 - New source version
+; v3.2.1 - New source version.
; v3.2.0 - New source version.
; v3.1.0 - New source version. Install and uninstall i18n files.
; v3.0.0 - Version for pidgin-2.0.0
@@ -43,7 +43,7 @@
; Welcome page
!insertmacro MUI_PAGE_WELCOME
; License page
-!insertmacro MUI_PAGE_LICENSE "c:\otr\COPYING.txt"
+!insertmacro MUI_PAGE_LICENSE "../../win32_export/COPYING.txt"
; Directory page
!insertmacro MUI_PAGE_DIRECTORY
; Instfiles page
@@ -82,29 +82,29 @@ Section "MainSection" SEC01
SetOutPath "$PidginDir\locale"
SetOverwrite on
- ; What the next line means is to recursively search c:\otr\locale
+ ; What the next line means is to recursively search /usr/share/locale
; and install all files under there named pidgin-otr.mo
- File /r "c:\otr\locale\pidgin-otr.mo"
+ File /r "/usr/share/locale/pidgin-otr.mo"
SetOutPath "$INSTDIR"
SetOverwrite on
- File "c:\otr\pidgin-otr.dll"
+ File "../../win32_export/pidgin-otr.dll"
; move to pidgin plugin directory, check if not busy (pidgin is running)
call CopyDLL
; hard part is done, do the rest now.
SetOverwrite on
- File "c:\otr\README.Toolkit.txt"
- File "c:\otr\README.txt"
- File "c:\otr\Protocol-v2.html"
- File "c:\otr\COPYING.txt"
- File "c:\otr\COPYING.LIB.txt"
- File "c:\otr\otr_mackey.exe"
- File "c:\otr\otr_modify.exe"
- File "c:\otr\otr_parse.exe"
- File "c:\otr\otr_readforge.exe"
- File "c:\otr\otr_remac.exe"
- File "c:\otr\otr_sesskeys.exe"
- File "c:\otr\pidgin-otr.nsi"
+ File "../../win32_export/README.Toolkit.txt"
+ File "../../win32_export/README.txt"
+ File "../../win32_export/COPYING.txt"
+ File "../../win32_export/COPYING.LIB.txt"
+ File "../../win32_export/Protocol-v2.html"
+ File "../../win32_export/otr_mackey.exe"
+ File "../../win32_export/otr_modify.exe"
+ File "../../win32_export/otr_parse.exe"
+ File "../../win32_export/otr_readforge.exe"
+ File "../../win32_export/otr_remac.exe"
+ File "../../win32_export/otr_sesskeys.exe"
+ File "pidgin-otr.nsi"
SectionEnd
Section -AdditionalIcons
@@ -136,7 +136,7 @@ Section Uninstall
Delete "$INSTDIR\pidgin-otr-uninst.exe"
Delete "$INSTDIR\README.Toolkit.txt"
Delete "$INSTDIR\README.txt"
- Delete "$INSTDIR\Protocol-v2.txt"
+ Delete "$INSTDIR\Protocol-v2.html"
Delete "$INSTDIR\COPYING.txt"
Delete "$INSTDIR\COPYING.LIB.txt"
Delete "$INSTDIR\otr_mackey.exe"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git
More information about the Pkg-privacy-commits
mailing list