Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HPCC-20917 Convert WsECL ESP Service XSD to new format #11950

Closed
wants to merge 3 commits into from
Closed

HPCC-20917 Convert WsECL ESP Service XSD to new format #11950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eab8cb
HPCC-20980 Automatically build and distribute jar files for embedded …
richardkchapman Nov 22, 2018
b1bfe59
Merge pull request #11939 from richardkchapman/embed-java
ghalliday Nov 28, 2018
82468b4
HPCC-20917 Convert WsECL ESP Service XSD to new format
kenrowland Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,7 @@

project(hpccsystems-platform)

if(UNIX AND NOT APPLE)
cmake_minimum_required(VERSION 3.3.2)
else()
cmake_minimum_required(VERSION 2.8.11)
endif()
cmake_minimum_required(VERSION 3.12.0)

set(TOP_LEVEL_PROJECT ON)
if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
Expand Down
313 changes: 0 additions & 313 deletions cmake_modules/FindJNI.cmake
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions ecl/hql/hqlatoms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ IIdAtom * getUTF8ResultId;
IIdAtom * importId;
IIdAtom * lineId;
IIdAtom * loadId;
IIdAtom * loadCompiledScriptId;
IIdAtom * macroId;
IIdAtom * maxLengthId;
IIdAtom * maxSizeId;
IIdAtom * __optionsId;
IIdAtom * outputId;
IIdAtom * physicalLengthId;
IIdAtom * prebindId;
IIdAtom * precompileId;
IIdAtom * __queryId;
IIdAtom * selfId;
IIdAtom * sharedId;
Expand Down Expand Up @@ -341,6 +343,7 @@ IAtom * persistAtom;
IAtom * physicalFilenameAtom;
IAtom * pluginAtom;
IAtom * prebindAtom;
IAtom * precompileAtom;
IAtom * prefetchAtom;
IAtom * preloadAtom;
IAtom * priorityAtom;
Expand Down Expand Up @@ -518,13 +521,15 @@ MODULE_INIT(INIT_PRIORITY_HQLATOM)
MAKEID(import);
MAKEID(line);
MAKEID(load);
MAKEID(loadCompiledScript);
MAKEID(macro);
MAKEID(maxLength);
MAKEID(maxSize);
MAKEID(__options);
MAKEID(output);
MAKEID(physicalLength);
MAKEID(prebind);
MAKEID(precompile);
MAKEID(__query);
MAKEID(self);
MAKEID(shared);
Expand Down Expand Up @@ -808,6 +813,7 @@ MODULE_INIT(INIT_PRIORITY_HQLATOM)
MAKEATOM(physicalFilename);
MAKEATOM(plugin);
MAKEATOM(prebind);
MAKEATOM(precompile);
MAKEATOM(prefetch);
MAKEATOM(preload);
MAKEATOM(priority);
Expand Down
3 changes: 3 additions & 0 deletions ecl/hql/hqlatoms.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,15 @@ extern HQL_API IIdAtom * getUTF8ResultId;
extern HQL_API IIdAtom * importId;
extern HQL_API IIdAtom * lineId;
extern HQL_API IIdAtom * loadId;
extern HQL_API IIdAtom * loadCompiledScriptId;
extern HQL_API IIdAtom * macroId;
extern HQL_API IIdAtom * maxLengthId;
extern HQL_API IIdAtom * maxSizeId;
extern HQL_API IIdAtom * __optionsId;
extern HQL_API IIdAtom * outputId;
extern HQL_API IIdAtom * physicalLengthId;
extern HQL_API IIdAtom * prebindId;
extern HQL_API IIdAtom * precompileId;
extern HQL_API IIdAtom * __queryId;
extern HQL_API IIdAtom * selfId;
extern HQL_API IIdAtom * sharedId;
Expand Down Expand Up @@ -346,6 +348,7 @@ extern HQL_API IAtom * persistAtom;
extern HQL_API IAtom * physicalFilenameAtom;
extern HQL_API IAtom * pluginAtom;
extern HQL_API IAtom * prebindAtom;
extern HQL_API IAtom * precompileAtom;
extern HQL_API IAtom * prefetchAtom;
extern HQL_API IAtom * preloadAtom;
extern HQL_API IAtom * priorityAtom;
Expand Down
Loading