aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-04-10 08:00:17 -0700
committerGerald Combs <gerald@wireshark.org>2015-04-10 17:16:21 +0000
commitfd72024bc27cdc073b5659415851a4f3d26efe22 (patch)
treed9e6237d7dea7b6bf061bd927dcac341221a1f63 /packaging/portableapps
parent1785d4206111dcbd0ef7ced3a1aad55da76c7b91 (diff)
Move the PortabaleApps packaging up one level.
Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/portableapps')
-rw-r--r--packaging/portableapps/Makefile.nmake (renamed from packaging/portableapps/win32/Makefile.nmake)18
-rw-r--r--packaging/portableapps/WiresharkPortable.ini (renamed from packaging/portableapps/win32/WiresharkPortable.ini)0
-rwxr-xr-xpackaging/portableapps/appinfo.tmpl (renamed from packaging/portableapps/win32/appinfo.tmpl)0
-rw-r--r--packaging/portableapps/help.html (renamed from packaging/portableapps/win32/help.html)0
-rw-r--r--packaging/portableapps/readme.txt (renamed from packaging/portableapps/win32/readme.txt)0
5 files changed, 9 insertions, 9 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/Makefile.nmake
index 94aa19e350..24afbbdb76 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/Makefile.nmake
@@ -1,9 +1,9 @@
#
-TOPDIR = ..\..\..
+TOPDIR = ..\..
TOOLS_DIR = $(TOPDIR)\tools
-include ../../../config.nmake
+include ../../config.nmake
PROGRAM_PORTABLE = $(PROGRAM_NAME)Portable
@@ -19,7 +19,7 @@ SOURCE = $(OTHER)\Source
APPINFO_INI = $(APPINFO)\appinfo.ini
LAUNCHER_INI = $(LAUNCHER_DIR)\$(PROGRAM_PORTABLE).ini
-WSMANIFEST = ../../wireshark.manifest
+WSMANIFEST = ../wireshark.manifest
NSIS_PLUGINS = nsis-plugins
FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll
@@ -34,13 +34,13 @@ WIN32_SETUP_OPT = --download
NSIS_DIR = $(TOPDIR)\packaging\nsis
# XXX This should be defined in config.nmake.
-!IF EXIST("..\..\wireshark-qt-release\wireshark.exe")
-QT_DIR = "..\..\wireshark-qt-release"
+!IF EXIST("$(TOPDIR)\wireshark-qt-release\wireshark.exe")
+QT_DIR = "$(TOPDIR)\wireshark-qt-release"
!ENDIF
-!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll")
+!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll")
NEED_QT5_DLL = USE
!ENDIF
-!IF EXIST("..\..\wireshark-qt-release\QtCore4.dll")
+!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll")
NEED_QT4_DLL = USE
!ENDIF
@@ -126,9 +126,9 @@ $(PAPPS_PACKAGE) : dirs appinfo appbinaries source
!ENDIF
clean:
- cd ../../
+ cd ..
$(MAKE) -f Makefile.nmake $@
- cd portableapps/win32
+ cd portableapps
rm -rf $(STAGING_DIR)
rm -rf appinfo.ini
rm -rf $(PAPPS_PACKAGE)
diff --git a/packaging/portableapps/win32/WiresharkPortable.ini b/packaging/portableapps/WiresharkPortable.ini
index 5fe664dcd8..5fe664dcd8 100644
--- a/packaging/portableapps/win32/WiresharkPortable.ini
+++ b/packaging/portableapps/WiresharkPortable.ini
diff --git a/packaging/portableapps/win32/appinfo.tmpl b/packaging/portableapps/appinfo.tmpl
index ef74ac58fd..ef74ac58fd 100755
--- a/packaging/portableapps/win32/appinfo.tmpl
+++ b/packaging/portableapps/appinfo.tmpl
diff --git a/packaging/portableapps/win32/help.html b/packaging/portableapps/help.html
index 35dae9b006..35dae9b006 100644
--- a/packaging/portableapps/win32/help.html
+++ b/packaging/portableapps/help.html
diff --git a/packaging/portableapps/win32/readme.txt b/packaging/portableapps/readme.txt
index 6efa5ff0f0..6efa5ff0f0 100644
--- a/packaging/portableapps/win32/readme.txt
+++ b/packaging/portableapps/readme.txt