Update 1.1.0

btcz · Nov 7, 2021 · d7054f3 · d7054f3
1 parent a7c195d
commit d7054f3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,4 @@ atomic_legacy_imgui
 .vscode/settings.json
 .vscode/tasks.json
 bundled
+ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data/bitcoinz-dex-desktop.7z
diff --git a/cmake/install/windows/windows_post_install.cmake b/cmake/install/windows/windows_post_install.cmake
@@ -1,17 +1,34 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../../project.metadata.cmake)
 
-get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
+set(CMAKE_SOURCE_DIR "C:/btcz/btcz/atomicDEX-Desktop/")
+set(CMAKE_CURRENT_SOURCE_DIR "C:/btcz/btcz/atomicDEX-Desktop/build")
+set(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR})
+
+message("Log: CMAKE_SOURCE_DIR - ${CMAKE_SOURCE_DIR}")
+message("Log: CMAKE_CURRENT_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}")
+message("Log: PROJECT_ROOT_DIR - ${PROJECT_ROOT_DIR}")
+
+#get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
 if (EXISTS ${PROJECT_ROOT_DIR}/build-Release)
     message(STATUS "from ci tools, readjusting")
     get_filename_component(PROJECT_ROOT_DIR ${PROJECT_ROOT_DIR} DIRECTORY)
 endif ()
 
 message(STATUS "PROJECT_ROOT_DIR -> ${PROJECT_ROOT_DIR}")
 
+message("Log: CMAKE_SOURCE_DIR - ${CMAKE_SOURCE_DIR}")
+message("Log: CMAKE_CURRENT_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}")
+message("Log: PROJECT_ROOT_DIR - ${PROJECT_ROOT_DIR}")
+
 set(PROJECT_APP_DIR bin)
-set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_APP_DIR})
+set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}build/${PROJECT_APP_DIR})
 set(TARGET_APP_PATH ${PROJECT_ROOT_DIR}/bundled/windows)
 
+
+message("Log: PROJECT_APP_DIR - ${PROJECT_APP_DIR}")
+message("Log: PROJECT_APP_PATH - ${PROJECT_APP_PATH}")
+message("Log: TARGET_APP_PATH - ${TARGET_APP_PATH}")
+
 if (EXISTS ${PROJECT_APP_PATH})
     message(STATUS "PROJECT_APP_PATH path is -> ${PROJECT_APP_PATH}")
     message(STATUS "TARGET_APP_PATH path is -> ${TARGET_APP_PATH}")
@@ -31,13 +48,13 @@ endif()
 
 if (NOT EXISTS ${TARGET_APP_PATH}/bin.zip)
 	message(STATUS "Copying ${CMAKE_SOURCE_DIR}/bin.zip to ${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip")
-	file(COPY ${CMAKE_SOURCE_DIR}/bin.zip DESTINATION ${TARGET_APP_PATH})
+	file(COPY ${CMAKE_SOURCE_DIR}/build/bin.zip DESTINATION ${TARGET_APP_PATH})
 else()
 	message(STATUS "${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip exists - skipping")
 endif()
 
 message(STATUS "Creating Installer")
-set(IFW_BINDIR $ENV{QT_ROOT}/Tools/QtInstallerFramework/4.1/bin)
+set(IFW_BINDIR C:/Qt/Tools/QtInstallerFramework/4.1/bin)
 message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
 if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
 	execute_process(COMMAND ${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z .

diff --git a/...tall/windows/windows_post_install_2.cmake → ...ndows/windows_post_install_original.cmake b/...tall/windows/windows_post_install_2.cmake → ...ndows/windows_post_install_original.cmake
@@ -1,8 +1,5 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../../project.metadata.cmake)
 
-set(CMAKE_SOURCE_DIR "F:/bitcoinz-dex-desktop")
-set(CMAKE_CURRENT_SOURCE_DIR "F:/bitcoinz-dex-desktop/build")
-
 get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
 if (EXISTS ${PROJECT_ROOT_DIR}/build-Release)
     message(STATUS "from ci tools, readjusting")
@@ -12,7 +9,7 @@ endif ()
 message(STATUS "PROJECT_ROOT_DIR -> ${PROJECT_ROOT_DIR}")
 
 set(PROJECT_APP_DIR bin)
-set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/build/${PROJECT_APP_DIR})
+set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_APP_DIR})
 set(TARGET_APP_PATH ${PROJECT_ROOT_DIR}/bundled/windows)
 
 if (EXISTS ${PROJECT_APP_PATH})
@@ -34,15 +31,15 @@ endif()
 
 if (NOT EXISTS ${TARGET_APP_PATH}/bin.zip)
 	message(STATUS "Copying ${CMAKE_SOURCE_DIR}/bin.zip to ${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip")
-	file(COPY ${CMAKE_SOURCE_DIR}/build/bin.zip DESTINATION ${TARGET_APP_PATH})
+	file(COPY ${CMAKE_SOURCE_DIR}/bin.zip DESTINATION ${TARGET_APP_PATH})
 else()
 	message(STATUS "${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip exists - skipping")
 endif()
 
 message(STATUS "Creating Installer")
-set(IFW_BINDIR C:/Qt/Tools/QtInstallerFramework/4.1/bin)
+set(IFW_BINDIR $ENV{QT_ROOT}/Tools/QtInstallerFramework/4.1/bin)
 message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
-if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}bin/${DEX_PROJECT_NAME}.7z)
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
 	execute_process(COMMAND ${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z .
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
 		ECHO_OUTPUT_VARIABLE
@@ -54,10 +51,10 @@ else()
 	message(STATUS "${DEX_PROJECT_NAME}.7z already exists skipping")
 endif()
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data)
 
 execute_process(COMMAND ${IFW_BINDIR}/binarycreator.exe -c ./config/config.xml -p ./packages/ ${DEX_PROJECT_NAME}_installer.exe
 	WORKING_DIRECTORY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows
 	ECHO_OUTPUT_VARIABLE
 	ECHO_ERROR_VARIABLE)
-file(COPY ${PROJECT_ROOT_DIR}ci_tools_atomic_dex/installer/windows/${DEX_PROJECT_NAME}_installer.exe DESTINATION ${TARGET_APP_PATH})
+file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/${DEX_PROJECT_NAME}_installer.exe DESTINATION ${TARGET_APP_PATH})