From 185ec7ff1162b5d01983918a99b60f655d18d27f Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Wed, 22 May 2019 14:42:15 -0400
Subject: [PATCH] [Android] CalcManager - include files

---
 .../CalcManager.Android.vcxproj               |  65 +++++++-
 .../CalcManager.Android.vcxproj.filters       | 146 +++++++++++++++++-
 .../CalcManager_Android.cpp                   |  40 -----
 src/CalcManager.Android/CalcManager_Android.h |  10 --
 src/CalcManager.Android/pch.h                 |   8 -
 5 files changed, 201 insertions(+), 68 deletions(-)
 delete mode 100644 src/CalcManager.Android/CalcManager_Android.cpp
 delete mode 100644 src/CalcManager.Android/CalcManager_Android.h
 delete mode 100644 src/CalcManager.Android/pch.h

diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj b/src/CalcManager.Android/CalcManager.Android.vcxproj
index 2b0959d8..78eb10bc 100644
--- a/src/CalcManager.Android/CalcManager.Android.vcxproj
+++ b/src/CalcManager.Android/CalcManager.Android.vcxproj
@@ -34,6 +34,64 @@
       <Platform>x86</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\CalcManager\CalculatorHistory.cpp" />
+    <ClCompile Include="..\CalcManager\CalculatorManager.cpp" />
+    <ClCompile Include="..\CalcManager\CCalcManager.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\calc.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\CalcInput.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\CalcUtils.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\History.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\Number.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\Rational.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\RationalMath.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\scicomm.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\scidisp.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\scifunc.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\scioper.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\sciset.cpp" />
+    <ClCompile Include="..\CalcManager\ExpressionCommand.cpp" />
+    <ClCompile Include="..\CalcManager\pch.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\basex.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\conv.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\exp.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\fact.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\itrans.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\itransh.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\logic.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\num.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\rat.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\support.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\trans.cpp" />
+    <ClCompile Include="..\CalcManager\Ratpack\transh.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\CalcManager\CalculatorHistory.h" />
+    <ClInclude Include="..\CalcManager\CalculatorManager.h" />
+    <ClInclude Include="..\CalcManager\CalculatorResource.h" />
+    <ClInclude Include="..\CalcManager\CalculatorVector.h" />
+    <ClInclude Include="..\CalcManager\CCalcManager.h" />
+    <ClInclude Include="..\CalcManager\Command.h" />
+    <ClInclude Include="..\CalcManager\compat.h" />
+    <ClInclude Include="..\CalcManager\ExpressionCommand.h" />
+    <ClInclude Include="..\CalcManager\ExpressionCommandInterface.h" />
+    <ClInclude Include="..\CalcManager\headers\CalcEngine.h" />
+    <ClInclude Include="..\CalcManager\headers\CalcInput.h" />
+    <ClInclude Include="..\CalcManager\headers\CalcUtils.h" />
+    <ClInclude Include="..\CalcManager\headers\CCommand.h" />
+    <ClInclude Include="..\CalcManager\headers\EngineStrings.h" />
+    <ClInclude Include="..\CalcManager\headers\History.h" />
+    <ClInclude Include="..\CalcManager\headers\ICalcDisplay.h" />
+    <ClInclude Include="..\CalcManager\headers\IHistoryDisplay.h" />
+    <ClInclude Include="..\CalcManager\headers\Number.h" />
+    <ClInclude Include="..\CalcManager\headers\RadixType.h" />
+    <ClInclude Include="..\CalcManager\headers\Rational.h" />
+    <ClInclude Include="..\CalcManager\headers\RationalMath.h" />
+    <ClInclude Include="..\CalcManager\pch.h" />
+    <ClInclude Include="..\CalcManager\Ratpack\CalcErr.h" />
+    <ClInclude Include="..\CalcManager\Ratpack\ratconst.h" />
+    <ClInclude Include="..\CalcManager\Ratpack\ratpak.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{08a1283c-522b-4820-8c56-361638a82e24}</ProjectGuid>
     <Keyword>Android</Keyword>
@@ -152,13 +210,6 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="CalcManager_Android.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CalcManager_Android.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file
diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
index b786da89..ed56f71d 100644
--- a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
+++ b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
@@ -1,10 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="CalcManager_Android.cpp" />
+    <Filter Include="CEngine">
+      <UniqueIdentifier>{8b6920ee-f524-4a48-837a-dba211bd5f7f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="headers">
+      <UniqueIdentifier>{628c5935-02b4-4f8a-b4f4-3850e24c8e36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="RatPack">
+      <UniqueIdentifier>{d346c535-3d9b-4cbf-a41e-b89243f563c0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="CalcManager_Android.h" />
-    <ClInclude Include="pch.h" />
+    <ClCompile Include="..\CalcManager\CalculatorHistory.cpp" />
+    <ClCompile Include="..\CalcManager\CalculatorManager.cpp" />
+    <ClCompile Include="..\CalcManager\CCalcManager.cpp" />
+    <ClCompile Include="..\CalcManager\ExpressionCommand.cpp" />
+    <ClCompile Include="..\CalcManager\pch.cpp" />
+    <ClCompile Include="..\CalcManager\CEngine\calc.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\CalcInput.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\CalcUtils.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\History.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\Number.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\Rational.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\RationalMath.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\scicomm.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\scidisp.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\scifunc.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\scioper.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\CEngine\sciset.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\basex.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\conv.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\exp.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\fact.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\itrans.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\itransh.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\logic.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\num.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\rat.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\support.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\trans.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CalcManager\Ratpack\transh.cpp">
+      <Filter>RatPack</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\CalcManager\CalculatorHistory.h" />
+    <ClInclude Include="..\CalcManager\CalculatorManager.h" />
+    <ClInclude Include="..\CalcManager\CalculatorResource.h" />
+    <ClInclude Include="..\CalcManager\CalculatorVector.h" />
+    <ClInclude Include="..\CalcManager\CCalcManager.h" />
+    <ClInclude Include="..\CalcManager\Command.h" />
+    <ClInclude Include="..\CalcManager\compat.h" />
+    <ClInclude Include="..\CalcManager\ExpressionCommand.h" />
+    <ClInclude Include="..\CalcManager\ExpressionCommandInterface.h" />
+    <ClInclude Include="..\CalcManager\pch.h" />
+    <ClInclude Include="..\CalcManager\headers\CalcEngine.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\CalcInput.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\CalcUtils.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\CCommand.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\EngineStrings.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\History.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\ICalcDisplay.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\IHistoryDisplay.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\Number.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\RadixType.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\Rational.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\headers\RationalMath.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\Ratpack\CalcErr.h">
+      <Filter>RatPack</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\Ratpack\ratconst.h">
+      <Filter>RatPack</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CalcManager\Ratpack\ratpak.h">
+      <Filter>RatPack</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CalcManager.Android/CalcManager_Android.cpp b/src/CalcManager.Android/CalcManager_Android.cpp
deleted file mode 100644
index 8ffe8b1b..00000000
--- a/src/CalcManager.Android/CalcManager_Android.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "CalcManager_Android.h"
-
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "CalcManager_Android", __VA_ARGS__))
-#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "CalcManager_Android", __VA_ARGS__))
-
-extern "C" {
-	/* This trivial function returns the platform ABI for which this dynamic native library is compiled.*/
-	const char * CalcManager_Android::getPlatformABI()
-	{
-	#if defined(__arm__)
-	#if defined(__ARM_ARCH_7A__)
-	#if defined(__ARM_NEON__)
-		#define ABI "armeabi-v7a/NEON"
-	#else
-		#define ABI "armeabi-v7a"
-	#endif
-	#else
-		#define ABI "armeabi"
-	#endif
-	#elif defined(__i386__)
-		#define ABI "x86"
-	#else
-		#define ABI "unknown"
-	#endif
-		LOGI("This dynamic shared library is compiled with ABI: %s", ABI);
-		return "This native library is compiled with ABI: %s" ABI ".";
-	}
-
-	void CalcManager_Android()
-	{
-	}
-
-	CalcManager_Android::CalcManager_Android()
-	{
-	}
-
-	CalcManager_Android::~CalcManager_Android()
-	{
-	}
-}
diff --git a/src/CalcManager.Android/CalcManager_Android.h b/src/CalcManager.Android/CalcManager_Android.h
deleted file mode 100644
index 14ab82a0..00000000
--- a/src/CalcManager.Android/CalcManager_Android.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-class CalcManager_Android
-{
-public:
-	const char * getPlatformABI();
-	CalcManager_Android();
-	~CalcManager_Android();
-};
-
diff --git a/src/CalcManager.Android/pch.h b/src/CalcManager.Android/pch.h
deleted file mode 100644
index bd99043a..00000000
--- a/src/CalcManager.Android/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <jni.h>
-#include <errno.h>
-
-#include <string.h>
-#include <unistd.h>
-#include <sys/resource.h>
-
-#include <android/log.h>