Remove 3rd party crashrpt
This commit is contained in:
parent
3547b29ad4
commit
57e0a5364b
|
@ -28,10 +28,7 @@ IF EXIST ..\..\thirdparty\canon\Header set WITH_CANON=Y
|
||||||
set WITH_GPHOTO2=N
|
set WITH_GPHOTO2=N
|
||||||
IF EXIST ..\..\thirdparty\libgphoto2\include set WITH_GPHOTO2=Y
|
IF EXIST ..\..\thirdparty\libgphoto2\include set WITH_GPHOTO2=Y
|
||||||
|
|
||||||
set WITH_CRASHRPT=N
|
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_GPHOTO2=%WITH_GPHOTO2%
|
||||||
IF EXIST ..\..\thirdparty\crashrpt\include set WITH_CRASHRPT=Y
|
|
||||||
|
|
||||||
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_GPHOTO2=%WITH_GPHOTO2% -DWITH_CRASHRPT=%WITH_CRASHRPT%
|
|
||||||
|
|
||||||
|
|
||||||
IF EXIST C:\ProgramData\chocolatey\bin\cl.exe (
|
IF EXIST C:\ProgramData\chocolatey\bin\cl.exe (
|
||||||
|
|
|
@ -36,12 +36,6 @@ IF EXIST ..\..\thirdparty\libgphoto2\include (
|
||||||
xcopy /Y /E ..\..\thirdparty\libgphoto2\bin Tahoma2D
|
xcopy /Y /E ..\..\thirdparty\libgphoto2\bin Tahoma2D
|
||||||
)
|
)
|
||||||
|
|
||||||
IF EXIST ..\..\thirdparty\crashrpt\include (
|
|
||||||
copy /Y ..\..\thirdparty\apps\crashrpt\CrashRpt1500.dll Tahoma2D
|
|
||||||
copy /Y ..\..\thirdparty\apps\crashrpt\CrashSender1500.exe Tahoma2D
|
|
||||||
copy /Y ..\..\thirdparty\apps\crashrpt\crashrpt_lang.ini Tahoma2D
|
|
||||||
)
|
|
||||||
|
|
||||||
echo ">>> Copying stuff to Tahoma2D\tahomastuff"
|
echo ">>> Copying stuff to Tahoma2D\tahomastuff"
|
||||||
|
|
||||||
mkdir Tahoma2D\tahomastuff
|
mkdir Tahoma2D\tahomastuff
|
||||||
|
|
|
@ -5,17 +5,6 @@ IF NOT EXIST apps mkdir apps
|
||||||
cd apps
|
cd apps
|
||||||
echo * > .gitignore
|
echo * > .gitignore
|
||||||
|
|
||||||
echo ">>> Getting CrashRpt"
|
|
||||||
|
|
||||||
IF EXIST crashrpt rmdir /S /Q crashrpt
|
|
||||||
curl -fsSL -o crashrpt-tahoma2d-win_2019.zip https://github.com/tahoma2d/crashrpt2/releases/download/v1.5.0.0/crashrpt-tahoma2d-win_2019.zip
|
|
||||||
7z x crashrpt-tahoma2d-win_2019.zip
|
|
||||||
rename crashrpt-tahoma2d-win_2019 crashrpt
|
|
||||||
IF EXIST ..\crashrpt\include rmdir /S /Q ..\crashrpt\include
|
|
||||||
IF EXIST ..\crashrpt\CrashRpt1500.lib del ..\crashrpt\CrashRpt1500.lib
|
|
||||||
move crashrpt\include ..\crashrpt
|
|
||||||
move crashrpt\CrashRpt1500.lib ..\crashrpt
|
|
||||||
|
|
||||||
echo ">>> Getting FFmpeg"
|
echo ">>> Getting FFmpeg"
|
||||||
|
|
||||||
IF EXIST ffmpeg rmdir /S /Q ffmpeg
|
IF EXIST ffmpeg rmdir /S /Q ffmpeg
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
CrashRpt
|
|
||||||
|
|
||||||
Copyright (c) 2003, The CrashRpt Project Authors.
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this
|
|
||||||
list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer in the documentation
|
|
||||||
and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
* Neither the name of the author nor the names of its contributors
|
|
||||||
may be used to endorse or promote products derived from this software without
|
|
||||||
specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
|
||||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
|
||||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
|
|
||||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
|
||||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
||||||
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
||||||
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
2
thirdparty/crashrpt/.gitignore
vendored
2
thirdparty/crashrpt/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
||||||
include/*
|
|
||||||
*.lib
|
|
10
thirdparty/crashrpt/copy_crashrpt.txt
vendored
10
thirdparty/crashrpt/copy_crashrpt.txt
vendored
|
@ -1,10 +0,0 @@
|
||||||
For Windows Builds Only!
|
|
||||||
|
|
||||||
Copy the include folder from the CrashRpt source to here.
|
|
||||||
Compile CrashRpt and copy the CrashRptXXXX.lib here also.
|
|
||||||
|
|
||||||
When releasing with CrashRpt, include:
|
|
||||||
CrashRptXXXX.dll
|
|
||||||
CrashSenderXXXX.exe
|
|
||||||
crashrpt_lang.ini
|
|
||||||
dbghelp.dll (optional)
|
|
|
@ -107,7 +107,6 @@ option(WITH_SYSTEM_SUPERLU "Use the system SuperLU library instead of 'thirdpary
|
||||||
option(WITH_CANON "Build with Canon DSLR support - Requires Canon SDK" OFF)
|
option(WITH_CANON "Build with Canon DSLR support - Requires Canon SDK" OFF)
|
||||||
option(WITH_GPHOTO2 "Build with Libgphoto2" OFF)
|
option(WITH_GPHOTO2 "Build with Libgphoto2" OFF)
|
||||||
option(WITH_TRANSLATION "Generate translation projects as well" ON)
|
option(WITH_TRANSLATION "Generate translation projects as well" ON)
|
||||||
option(WITH_CRASHRPT "Build CrashRpt support - Requires CrashRpt Library" OFF)
|
|
||||||
option(WITH_WINTAB "(Windows only) Build with customized Qt with WinTab support. https://github.com/shun-iwasawa/qt5/releases/tag/v5.15.2_wintab" OFF)
|
option(WITH_WINTAB "(Windows only) Build with customized Qt with WinTab support. https://github.com/shun-iwasawa/qt5/releases/tag/v5.15.2_wintab" OFF)
|
||||||
|
|
||||||
# avoid using again
|
# avoid using again
|
||||||
|
@ -281,12 +280,6 @@ if(BUILD_ENV_MSVC)
|
||||||
-DGLUT_NO_LIB_PRAGMA
|
-DGLUT_NO_LIB_PRAGMA
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WITH_CRASHRPT)
|
|
||||||
include_directories(
|
|
||||||
${SDKROOT}/crashrpt/include
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_GPHOTO2)
|
if(WITH_GPHOTO2)
|
||||||
include_directories(
|
include_directories(
|
||||||
${SDKROOT}/libgphoto2/include
|
${SDKROOT}/libgphoto2/include
|
||||||
|
@ -396,10 +389,6 @@ if(BUILD_ENV_MSVC)
|
||||||
set(MYPAINT_LIB_INCLUDE_DIRS ${SDKROOT}/libmypaint/dist/${PLATFORM}/include/libmypaint)
|
set(MYPAINT_LIB_INCLUDE_DIRS ${SDKROOT}/libmypaint/dist/${PLATFORM}/include/libmypaint)
|
||||||
set(MYPAINT_LIB_LDFLAGS ${SDKROOT}/libmypaint/dist/${PLATFORM}/libmypaint.lib)
|
set(MYPAINT_LIB_LDFLAGS ${SDKROOT}/libmypaint/dist/${PLATFORM}/libmypaint.lib)
|
||||||
|
|
||||||
if(WITH_CRASHRPT)
|
|
||||||
set(CRASHRPT_LIB ${SDKROOT}/crashrpt/CrashRpt1500.lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_GPHOTO2)
|
if(WITH_GPHOTO2)
|
||||||
set(GPHOTO2_LIB ${SDKROOT}/libgphoto2/lib/libgphoto2.lib)
|
set(GPHOTO2_LIB ${SDKROOT}/libgphoto2/lib/libgphoto2.lib)
|
||||||
set(GPHOTO2_PORT_LIB ${SDKROOT}/libgphoto2/lib/libgphoto2_port.lib)
|
set(GPHOTO2_PORT_LIB ${SDKROOT}/libgphoto2/lib/libgphoto2_port.lib)
|
||||||
|
|
|
@ -447,14 +447,6 @@ if (WITH_CANON)
|
||||||
add_definitions(-DWITH_CANON)
|
add_definitions(-DWITH_CANON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WITH_CRASHRPT)
|
|
||||||
add_definitions(-DWITH_CRASHRPT)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WITH_GPHOTO2)
|
|
||||||
add_definitions(-DWITH_GPHOTO2)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WITH_WINTAB AND BUILD_TARGET_WIN AND (PLATFORM EQUAL 64))
|
if (WITH_WINTAB AND BUILD_TARGET_WIN AND (PLATFORM EQUAL 64))
|
||||||
add_definitions(-DWITH_WINTAB)
|
add_definitions(-DWITH_WINTAB)
|
||||||
endif()
|
endif()
|
||||||
|
@ -481,10 +473,6 @@ if(BUILD_ENV_MSVC)
|
||||||
set(EXTRA_LIBS ${EXTRA_LIBS} ${CANON_LIB})
|
set(EXTRA_LIBS ${EXTRA_LIBS} ${CANON_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_CRASHRPT)
|
|
||||||
set(EXTRA_LIBS ${EXTRA_LIBS} ${CRASHRPT_LIB})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_GPHOTO2)
|
if(WITH_GPHOTO2)
|
||||||
set(EXTRA_LIBS ${EXTRA_LIBS} ${GPHOTO2_LIB} ${GPHOTO2_PORT_LIB} ${GPHOTO2_COMPAT_LIB})
|
set(EXTRA_LIBS ${EXTRA_LIBS} ${GPHOTO2_LIB} ${GPHOTO2_PORT_LIB} ${GPHOTO2_COMPAT_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
// Soli Deo gloria
|
// Soli Deo gloria
|
||||||
#ifdef WITH_CRASHRPT
|
|
||||||
#include <tchar.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Tnz6 includes
|
// Tnz6 includes
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
@ -70,10 +67,6 @@
|
||||||
|
|
||||||
#include "kis_tablet_support_win8.h"
|
#include "kis_tablet_support_win8.h"
|
||||||
|
|
||||||
#ifdef WITH_CRASHRPT
|
|
||||||
#include "CrashRpt.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MACOSX
|
#ifdef MACOSX
|
||||||
#include "tipc.h"
|
#include "tipc.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -576,34 +569,6 @@ int main(int argc, char *argv[]) {
|
||||||
// Toonz environment
|
// Toonz environment
|
||||||
initToonzEnv(argumentPathValues);
|
initToonzEnv(argumentPathValues);
|
||||||
|
|
||||||
#ifdef WITH_CRASHRPT
|
|
||||||
std::string str;
|
|
||||||
|
|
||||||
CR_INSTALL_INFO pInfo;
|
|
||||||
memset(&pInfo, 0, sizeof(CR_INSTALL_INFO));
|
|
||||||
pInfo.cb = sizeof(CR_INSTALL_INFO);
|
|
||||||
|
|
||||||
str = TEnv::getApplicationName();
|
|
||||||
std::wstring wAppName = std::wstring(str.begin(), str.end());
|
|
||||||
pInfo.pszAppName = wAppName.c_str();
|
|
||||||
|
|
||||||
str = TEnv::getApplicationVersion();
|
|
||||||
std::wstring wAppVersion = std::wstring(str.begin(), str.end());
|
|
||||||
pInfo.pszAppVersion = wAppVersion.c_str();
|
|
||||||
|
|
||||||
TFilePath crashrptCache =
|
|
||||||
ToonzFolder::getCacheRootFolder() + TFilePath("crashrpt");
|
|
||||||
str = crashrptCache.getQString().toStdString();
|
|
||||||
std::wstring wRptdir = std::wstring(str.begin(), str.end());
|
|
||||||
pInfo.pszErrorReportSaveDir = wRptdir.c_str();
|
|
||||||
|
|
||||||
// Install all available exception handlers.
|
|
||||||
// Don't send reports automaticall, store locally
|
|
||||||
pInfo.dwFlags |= CR_INST_ALL_POSSIBLE_HANDLERS | CR_INST_DONT_SEND_REPORT;
|
|
||||||
|
|
||||||
crInstall(&pInfo);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// prepare for 30bit display
|
// prepare for 30bit display
|
||||||
if (Preferences::instance()->is30bitDisplayEnabled()) {
|
if (Preferences::instance()->is30bitDisplayEnabled()) {
|
||||||
QSurfaceFormat sFmt = QSurfaceFormat::defaultFormat();
|
QSurfaceFormat sFmt = QSurfaceFormat::defaultFormat();
|
||||||
|
@ -915,9 +880,5 @@ int main(int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_CRASHRPT
|
|
||||||
crUninstall();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue