Fixed some paths in samples

danieleteti · Apr 13, 2019 · e7f2608 · e7f2608
1 parent 2a3bef8
commit e7f2608
Show file tree

Hide file tree

Showing 10 changed files with 597 additions and 409 deletions.
diff --git a/LOGGERPRO-BUILD-TIMESTAMP.TXT b/LOGGERPRO-BUILD-TIMESTAMP.TXT
@@ -1 +1 @@
-09/01/2019  9:28:42 
+13/04/2019 11:02:52 
diff --git a/VERSION.TXT b/VERSION.TXT
@@ -1,2 +1,2 @@
-VERSION 1_3_1
-BUILD DATETIME 2019-01-09T09:28:42.304694
+VERSION v1.3.2
+BUILD DATETIME 2019-04-13T11:02:52.318668
diff --git a/dodo.py b/dodo.py
@@ -24,11 +24,11 @@
 			('samples\\60_logging_inside_dll\\MainProgram.dproj','Win32'),
 			('samples\\60_logging_inside_dll\\mydll.dproj','Win32'),
 		    ('samples\\70_isapi_sample\\loggerproisapisample.dproj','Win32'),
-			('samples\\90_remote_logging_with_redis\\RemoteRedisAppenderSample.dproj','Win32'),
-			('samples\\90_remote_logging_with_redis\\redis_logs_viewer\\RedisLogsViewer.dproj','Win32'),
+			('samples\\90_remote_logging_with_redis\\REDISAppenderSample.dproj','Win32'),
+			('samples\\90_remote_logging_with_redis\\redis_logs_viewer\\REDISLogsViewer.dproj','Win32'),
             ('samples\\100_udp_syslog\\udp_syslog.dproj','Win32'),
             ('samples\\110_rest_appender\RESTAppenderSample.dproj','Win32'),
-            ('samples\\110_rest_appender_mobile\MobileRESTAppenderSample.dproj','Android'),
+            ('samples\\110_rest_appender_mobile\RESTAppenderMobileSample.dproj','Android'),
             ('samples\\120_elastic_search_appender\\ElasticSearchAppenderSample.dproj','Win32'),
             ('samples\\rest_logs_collector\RESTLogsCollector.dproj','Win32')
 ]

diff --git a/samples/110_rest_appender_mobile/Android/Debug/AndroidManifest.xml b/samples/110_rest_appender_mobile/Android/Debug/AndroidManifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.embarcadero.RESTAppenderMobileSample"
+        android:versionCode="1"
+        android:versionName="1.0.0"
+        android:installLocation="auto">
+
+    <!-- This is the platform API where NativeActivity was introduced. -->
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="True"/>
+    <application android:persistent="False" 
+		android:usesCleartextTraffic="true"	
+        android:restoreAnyVersion="False" 
+        android:label="RESTAppenderMobileSample" 
+        android:debuggable="True" 
+        android:largeHeap="False"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/AppTheme"
+        android:hardwareAccelerated="true">
+
+
+
+        <!-- Our activity is a subclass of the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code. -->
+        <activity android:name="com.embarcadero.firemonkey.FMXNativeActivity"
+                android:label="RESTAppenderMobileSample"
+                android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+                android:launchMode="singleTask">
+            <!-- Tell NativeActivity the name of our .so -->
+            <meta-data android:name="android.app.lib_name"
+                android:value="RESTAppenderMobileSample" />
+            <intent-filter>  
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter> 
+        </activity>
+
+        <receiver android:name="com.embarcadero.rtl.notifications.NotificationAlarm" />
+
+    </application>
+</manifest>
+<!-- END_INCLUDE(manifest) -->
diff --git a/..._with_redis/RemoteRedisAppenderSample.dpr → ...ogging_with_redis/REDISAppenderSample.dpr b/..._with_redis/RemoteRedisAppenderSample.dpr → ...ogging_with_redis/REDISAppenderSample.dpr
@@ -1,4 +1,4 @@
-program RemoteRedisAppenderSample;
+program REDISAppenderSample;
 
 uses
   Vcl.Forms,

diff --git a/...ith_redis/RemoteRedisAppenderSample.dproj → ...ging_with_redis/REDISAppenderSample.dproj b/...ith_redis/RemoteRedisAppenderSample.dproj → ...ging_with_redis/REDISAppenderSample.dproj
diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr
@@ -1,4 +1,4 @@
-program RedisLogsViewer;
+program REDISLogsViewer;
 
 uses
   Vcl.Forms,

diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj
diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res
diff --git a/samples/SampleLoggerGroup.groupproj b/samples/SampleLoggerGroup.groupproj
@@ -39,6 +39,12 @@
         <Projects Include="rest_logs_collector\RESTLogsCollector.dproj">
             <Dependencies/>
         </Projects>
+        <Projects Include="90_remote_logging_with_redis\REDISAppenderSample.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="90_remote_logging_with_redis\redis_logs_viewer\REDISLogsViewer.dproj">
+            <Dependencies/>
+        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -155,14 +161,32 @@
     <Target Name="RESTLogsCollector:Make">
         <MSBuild Projects="rest_logs_collector\RESTLogsCollector.dproj" Targets="Make"/>
     </Target>
+    <Target Name="REDISAppenderSample">
+        <MSBuild Projects="90_remote_logging_with_redis\REDISAppenderSample.dproj"/>
+    </Target>
+    <Target Name="REDISAppenderSample:Clean">
+        <MSBuild Projects="90_remote_logging_with_redis\REDISAppenderSample.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="REDISAppenderSample:Make">
+        <MSBuild Projects="90_remote_logging_with_redis\REDISAppenderSample.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="REDISLogsViewer">
+        <MSBuild Projects="90_remote_logging_with_redis\redis_logs_viewer\REDISLogsViewer.dproj"/>
+    </Target>
+    <Target Name="REDISLogsViewer:Clean">
+        <MSBuild Projects="90_remote_logging_with_redis\redis_logs_viewer\REDISLogsViewer.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="REDISLogsViewer:Make">
+        <MSBuild Projects="90_remote_logging_with_redis\redis_logs_viewer\REDISLogsViewer.dproj" Targets="Make"/>
+    </Target>
     <Target Name="Build">
-        <CallTarget Targets="global_logger;file_appender;console_appender;outputdebugstring_appender;multiple_appenders;multiple_loggers;custom_appender;vcl_appenders;udp_syslog;RESTAppenderSample;RESTAppenderMobileSample;RESTLogsCollector"/>
+        <CallTarget Targets="global_logger;file_appender;console_appender;outputdebugstring_appender;multiple_appenders;multiple_loggers;custom_appender;vcl_appenders;udp_syslog;RESTAppenderSample;RESTAppenderMobileSample;RESTLogsCollector;REDISAppenderSample;REDISLogsViewer"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="global_logger:Clean;file_appender:Clean;console_appender:Clean;outputdebugstring_appender:Clean;multiple_appenders:Clean;multiple_loggers:Clean;custom_appender:Clean;vcl_appenders:Clean;udp_syslog:Clean;RESTAppenderSample:Clean;RESTAppenderMobileSample:Clean;RESTLogsCollector:Clean"/>
+        <CallTarget Targets="global_logger:Clean;file_appender:Clean;console_appender:Clean;outputdebugstring_appender:Clean;multiple_appenders:Clean;multiple_loggers:Clean;custom_appender:Clean;vcl_appenders:Clean;udp_syslog:Clean;RESTAppenderSample:Clean;RESTAppenderMobileSample:Clean;RESTLogsCollector:Clean;REDISAppenderSample:Clean;REDISLogsViewer:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="global_logger:Make;file_appender:Make;console_appender:Make;outputdebugstring_appender:Make;multiple_appenders:Make;multiple_loggers:Make;custom_appender:Make;vcl_appenders:Make;udp_syslog:Make;RESTAppenderSample:Make;RESTAppenderMobileSample:Make;RESTLogsCollector:Make"/>
+        <CallTarget Targets="global_logger:Make;file_appender:Make;console_appender:Make;outputdebugstring_appender:Make;multiple_appenders:Make;multiple_loggers:Make;custom_appender:Make;vcl_appenders:Make;udp_syslog:Make;RESTAppenderSample:Make;RESTAppenderMobileSample:Make;RESTLogsCollector:Make;REDISAppenderSample:Make;REDISLogsViewer:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>