Skip to content

Commit

Permalink
Jared/remove extras dependency (#1707)
Browse files Browse the repository at this point in the history
* extras dependency removed and sample app still builds, and runs without the ability to download data.

* samples download and unzip with the replacement zlib-ng/minizip-ng. testing unzip on other platforms.

* zlib-ng/minizip-ng

* zconf.h before cmake generation

* updates

* update to pro

* fix paths for storing data

* first pass of cleanup. Needs another pass and condensing of extras api moved into the sampleviewer.

* not sure how these were getting pickedup in the includepath but this is fixed now.

* files no longer needed.

* updated to have a constructor that sets the path rather than having to call setPath after it has been created.

* Almost ready for review. Quick test on windows.

* reog

* put it back

* no longer needed.

* update.

* QML stuff no longer needed.

* Disabling since we don't need it to build.

* no longer needed.

* undoing changes no longer needed.

* remove build folder and other remnants.

* remove build folder from minizip-ng

* Lots of files not needed for zlib-ng/minizip-ng. Reducing to whats necessary.

* moving this back.

* moved zlib, minizip, and helper file into it's own pri

* Update ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/ZipHelper.h

Co-authored-by: James Ballard <[email protected]>

* pr feedback.

* pr feedback.

* cleaned up a little.

* little more condensing.

* cleanup.

* rogue parentheses

* reduced zlib-ng files

* forward declare.

* adding ignore for all build directories.

* Testing to see if we really need this. This call into zlib-ng/minizip-ng which requires us to include mz_crypt currently.

* this seems to be the only way to read a zip file which is needed by our ZipHelper to properly unzip an archive. Oh well.

---------

Co-authored-by: James Ballard <[email protected]>
  • Loading branch information
jared-2016 and JamesMBallard authored May 22, 2024
1 parent 9d0201d commit a254a04
Show file tree
Hide file tree
Showing 102 changed files with 31,617 additions and 495 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,6 @@ Desktop.ini
ehthumbs.db
Thumbs.db

*.user.2.7pre1
# ignore all build directories

*build*
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ exists($$PWD/../../../../DevBuildCpp.pri) {
include($$PWD/../../../toolkit/uitools/toolkitcpp.pri)

INCLUDEPATH += \
$$SAMPLEPATHCPP \
$$COMMONVIEWER \
$$COMMONVIEWER/SyntaxHighlighter \
$$PWD/../../../../api/qt_cpp/Include \
$$PWD/../../../../api/qt_cpp/Include/LocalServer/ \
$$PWD/../../../../api/qt_cpp/Include/LocalServer/
} else {
message("Building against the installed SDK")
CONFIG += build_from_setup
Expand All @@ -71,6 +72,7 @@ exists($$PWD/../../../../DevBuildCpp.pri) {
}
INCLUDEPATH += \
$$SAMPLEPATHCPP \
$$COMMONVIEWER \
$$COMMONVIEWER/SyntaxHighlighter \
$$priLocation/sdk/include \
Expand All @@ -84,19 +86,16 @@ exists($$PWD/../../../../DevBuildCpp.pri) {
else {
PLATFORM = "linux/x64"
}
ARCGIS_RUNTIME_IMPORT_PATH = $${priLocation}/sdk/$${PLATFORM}/qml
}
macx:{
PLATFORM = "macOS"
ARCGIS_RUNTIME_IMPORT_PATH = $${priLocation}/sdk/$${PLATFORM}/universal/qml
}
win32:{
contains(QT_ARCH, x86_64):{
PLATFORM = "windows/x64"
}
ARCGIS_RUNTIME_IMPORT_PATH = $${priLocation}/sdk/$${PLATFORM}/qml
}
android {
Expand All @@ -116,26 +115,13 @@ exists($$PWD/../../../../DevBuildCpp.pri) {
}
contains(QMAKE_HOST.os, Windows):{
ANDROIDDIR = $$clean_path($$(ALLUSERSPROFILE)\\EsriRuntimeQt)
ARCGIS_RUNTIME_IMPORT_PATH = $${ANDROIDDIR}/Qt$${ARCGIS_RUNTIME_VERSION}/$${PLATFORM}/$${ANDROID_ARCH_FOLDER}/qml
}
else {
ARCGIS_RUNTIME_IMPORT_PATH = $${priLocation}/sdk/$${PLATFORM}/$${ANDROID_ARCH_FOLDER}/qml
}
}
ios {
PLATFORM = "iOS"
ARCGIS_RUNTIME_IMPORT_PATH = $${priLocation}/sdk/$${PLATFORM}/universal/qml
}
# Add plugin paths to QML_IMPORT_PATH
QML_IMPORT_PATH += $${ARCGIS_RUNTIME_IMPORT_PATH}
# Add plugin paths to QMLPATHS
QMLPATHS += $${ARCGIS_RUNTIME_IMPORT_PATH}
# Set ArcGIS Runtime QML import path for ArcGISExtras
DEFINES += ARCGIS_RUNTIME_IMPORT_PATH=\"$$ARCGIS_RUNTIME_IMPORT_PATH\"
DEFINES += BUILD_FROM_SETUP
}
Expand All @@ -152,6 +138,9 @@ QMAKE_TARGET_COPYRIGHT = Copyright 2017 Esri Inc.
# include the samples.pri, which contains all the sample resources
include(samples.pri)
# contains source files for zlib-ng and minizip-ng and the helper that uses them
include(zlib_minizip_ng.pri)
CONFIG(precompile_header): DEFINES += PCH_BUILD
android {
Expand All @@ -160,14 +149,12 @@ android {
}
HEADERS += \
CppSampleManager.h \
$$PCH_HEADER \
$$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.h \
$$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.h \
$$COMMONVIEWER/CategoryListModel.h \
$$COMMONVIEWER/DataItem.h \
$$COMMONVIEWER/DataItemListModel.h \
$$COMMONVIEWER/DownloadSampleManager.h \
$$COMMONVIEWER/Sample.h \
$$COMMONVIEWER/SampleCategory.h \
$$COMMONVIEWER/SampleListModel.h \
Expand All @@ -180,13 +167,11 @@ HEADERS += \
$$COMMONVIEWER/SourceCodeListModel.h
SOURCES += \
CppSampleManager.cpp \
$$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.cpp \
$$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.cpp \
$$COMMONVIEWER/CategoryListModel.cpp \
$$COMMONVIEWER/DataItem.cpp \
$$COMMONVIEWER/DataItemListModel.cpp \
$$COMMONVIEWER/DownloadSampleManager.cpp \
$$COMMONVIEWER/Sample.cpp \
$$COMMONVIEWER/SampleCategory.cpp \
$$COMMONVIEWER/SampleListModel.cpp \
Expand All @@ -206,7 +191,6 @@ RESOURCES += \
$$PWD/imports.qrc
DEFINES += QT_DEPRECATED_WARNINGS

#-------------------------------------------------
# Application Icon
#-------------------------------------------------
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import QtSensors
import QtPositioning
import QtQuick.XmlListModel
import QtWebView
import Esri.ArcGISExtras
import Esri.ArcGISRuntime.Toolkit

Item {
Expand Down
Loading

0 comments on commit a254a04

Please sign in to comment.