ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 19:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows dist: move r2 related data to <radare2> subdir (#466)

Browse Source 
* Update radare2
* Windows dist: move r2 related data to <radare2> subdir
This commit is contained in:
Paul I 2018-04-30 23:03:31 +03:00 committed by xarkes
parent eeec725b94
commit e97c22f214
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.bat
View File

@ -26,7 +26,6 @@ IF !ERRORLEVEL! NEQ 0 EXIT /B 1
ECHO Deploying cutter ECHO Deploying cutter
MKDIR cutter MKDIR cutter
COPY release\cutter.exe cutter\cutter.exe COPY release\cutter.exe cutter\cutter.exe
XCOPY /S /I ..\%R2DIST%\www cutter\www XCOPY /S /I ..\%R2DIST%\radare2 cutter\radare2
XCOPY /S /I ..\%R2DIST%\share cutter\share
COPY ..\%R2DIST%\*.dll cutter\ COPY ..\%R2DIST%\*.dll cutter\
windeployqt cutter\cutter.exe windeployqt cutter\cutter.exe

8
meson.py
View File

@ -71,7 +71,9 @@ def win_dist(args):
log.debug('Deploying Qt5') log.debug('Deploying Qt5')
subprocess.call(['windeployqt', '--release', os.path.join(dist, 'Cutter.exe')]) subprocess.call(['windeployqt', '--release', os.path.join(dist, 'Cutter.exe')])
log.debug('Deploying libr2') log.debug('Deploying libr2')
r2_meson_mod.win_dist_libr2(DIST=dist, BUILDDIR=os.path.join(build, 'subprojects', 'radare2')) r2_meson_mod.PATH_FMT.update(r2_meson_mod.R2_PATH)
r2_meson_mod.win_dist_libr2(DIST=dist, BUILDDIR=os.path.join(build, 'subprojects', 'radare2'),
R2_DATDIR=r'radare2\share', R2_INCDIR=r'radare2\include')
def build(args): def build(args):
cutter_builddir = os.path.join(ROOT, args.dir) cutter_builddir = os.path.join(ROOT, args.dir)
@ -87,6 +89,10 @@ def build(args):
defines.append('-Dqresources=%s' % ','.join(VARS['RESOURCES'])) defines.append('-Dqresources=%s' % ','.join(VARS['RESOURCES']))
defines.append('-Denable_jupyter=%s' % str(args.jupyter).lower()) defines.append('-Denable_jupyter=%s' % str(args.jupyter).lower())
defines.append('-Denable_webengine=%s' % str(args.webengine).lower()) defines.append('-Denable_webengine=%s' % str(args.webengine).lower())
if os.name == 'nt':
defines.append('-Dradare2:r2_incdir=radare2/include')
defines.append('-Dradare2:r2_libdir=radare2/lib')
defines.append('-Dradare2:r2_datdir=radare2/share')
r2_meson_mod.meson(os.path.join(ROOT, 'src'), cutter_builddir, r2_meson_mod.meson(os.path.join(ROOT, 'src'), cutter_builddir,
prefix=cutter_builddir, backend=args.backend, prefix=cutter_builddir, backend=args.backend,
release=True, shared=False, options=defines) release=True, shared=False, options=defines)

2
prepare_r2.bat
View File

@ -16,6 +16,6 @@ ECHO Building radare2 (%PLATFORM%)
CD radare2 CD radare2
git clean -xfd git clean -xfd
RMDIR /S /Q ..\%R2DIST% RMDIR /S /Q ..\%R2DIST%
python sys\meson.py --release --shared --install=..\%R2DIST% python sys\meson.py --release --shared --install=..\%R2DIST% --options r2_datdir=radare2/share
IF !ERRORLEVEL! NEQ 0 EXIT /B 1 IF !ERRORLEVEL! NEQ 0 EXIT /B 1
REN ..\%R2DIST%\lib\libr_shlr.a r_shlr.lib REN ..\%R2DIST%\lib\libr_shlr.a r_shlr.lib

2
radare2

@ -1 +1 @@
Subproject commit c79874941e4e4cc03c7135e65ea1d5adecb0bb1e Subproject commit a2fbe0ed2dfa95365e04b61a1c33dc2cc7905516

4
src/lib_radare2.pri
View File

@ -4,10 +4,10 @@ win32 {
INCLUDEPATH += "$$PWD/../radare2/libr/include/msvc" INCLUDEPATH += "$$PWD/../radare2/libr/include/msvc"
!contains(QT_ARCH, x86_64) { !contains(QT_ARCH, x86_64) {
LIBS += -L"$$PWD/../r2_dist_x86/lib" LIBS += -L"$$PWD/../r2_dist_x86/lib"
INCLUDEPATH += "$$PWD/../r2_dist_x86/include/libr" INCLUDEPATH += "$$PWD/../r2_dist_x86/include"
} else { } else {
LIBS += -L"$$PWD/../r2_dist_x64/lib" LIBS += -L"$$PWD/../r2_dist_x64/lib"
INCLUDEPATH += "$$PWD/../r2_dist_x64/include/libr" INCLUDEPATH += "$$PWD/../r2_dist_x64/include"
} }
LIBS += \ LIBS += \