Merge pull request #227 from foodtiny/development

Merge to master

Author: Food Tiny

.travis.yml

@@ -20,12 +20,8 @@ script:
 - make native_test -j8
 - ./misc/memory_check
 - make native && sudo make install && sudo ldconfig
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd examples && ./build; fi
+- cd examples && ./build
 after_success:
-  - cd ${TRAVIS_BUILD_DIR}
-  - lcov --directory . --capture --output-file coverage.info
-  - lcov --remove coverage.info '/usr/*' --output-file coverage.info
-  - lcov --list coverage.info
-  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
+- ./misc/codecov.sh
 notifications:
   slack: foodtiny:hzkLBCLrqjtgi9ctqwdQ034S

CMakeLists.txt

@@ -133,7 +133,6 @@ add_executable(${PROJECT_NAME}_test_c ${TESTS_C} ${SOURCES_C} misc/unit-test.c)
 add_executable(${PROJECT_NAME}_test ${TESTS_C} ${SOURCES_C} ${TESTS_CPP} ${SOURCES_CPP} misc/unit-test.c)
 
 # Create native library for static linking
-add_library(${PROJECT_NAME}_static ${SOURCES_C} ${SOURCES_CPP})
 add_library(${PROJECT_NAME} SHARED ${SOURCES_C} ${SOURCES_CPP})
 
 # Add make test
@@ -171,7 +170,6 @@ include(CTest)
 enable_testing()
 
 # Add make installation - install to Unix system
-install(TARGETS ${PROJECT_NAME}_static DESTINATION lib)
 install(TARGETS ${PROJECT_NAME} DESTINATION lib)
 install(FILES library.hpp DESTINATION include/native)
 install(DIRECTORY java DESTINATION include/native FILES_MATCHING PATTERN "*.hpp")
@@ -189,17 +187,14 @@ add_custom_target(
 # Darwin platform no need to link realtime library (-lrt)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} -lm)
-    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} -lm)
     target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} -lm)
     target_link_libraries(${PROJECT_NAME}_test_c ${CMAKE_THREAD_LIBS_INIT} -lm)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} -lm -lrt)
-    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT} -lm -lrt)
     target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} -lm -lrt)
     target_link_libraries(${PROJECT_NAME}_test_c ${CMAKE_THREAD_LIBS_INIT} -lm -lrt)
 else ()
     target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} -lm)
-    target_link_libraries(${PROJECT_NAME}_static ${CMAKE_THREAD_LIBS_INIT}-lm)
     target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} -lm)
     target_link_libraries(${PROJECT_NAME}_test_c ${CMAKE_THREAD_LIBS_INIT} -lm)
 endif ()

README.md

@@ -8,7 +8,7 @@
 - Blazing fast performance, small footprint, low-level access with GAS & C
 - Provide rich Java core packages for productivity & maintainability
 - Zero memory leak with automatic storage
-- Prevents segfaults and no null pointer anymore
+- Prevents segfaults and null pointer exception
 
 
 This project is also useful for new developers in practical programming.
@@ -36,6 +36,13 @@ public:
             hashMap.put("argument " + String::valueOf(counter), argument);
             counter++;
         }
+        // Collect key value pairs
+        String pairs = "Pairs: \n";
+        for (Map<String, String>::Entry entry : hashMap.entrySet()) {
+            pairs += entry.getKey() + String(" - ") + entry.getValue() + String("\n");
+        }
+        System::out::println(pairs);
+        // Serialize to json data
         ArrayList<HashMap<String, String>> arrayList;
         arrayList.add(hashMap);
         System::out::println(arrayList.toString());
@@ -51,12 +58,18 @@ int main(int argc, char **argv) {
 Compile your source and link with native library
 ```bash
 $ g++ -c -o main.o HelloWorld.cpp
-$ gcc -o main main.o -lnative -lstdc++
+$ g++ -o main main.o -lnative
 $ ./main one two three
 ```
 
 Output:
 ```javascript
+We have 4 pairs:
+argument 3 is three
+argument 2 is two
+argument 1 is one
+argument 0 is ./main
+
 [{"argument 0": "./main", "argument 1": "one", "argument 2": "two", "argument 3": "three"}]
 ```
 

codecov.yml

@@ -22,6 +22,8 @@ parsers:
       loop: yes
       method: no
       macro: no
+ignore:
+  - "kernel/test.h"
 
 comment:
   layout: "reach, diff, flags, files, footer"

examples/Application/Main/MainApplication.cpp

@@ -2,17 +2,24 @@
 
 class MainApplication {
 public:
-	static void main(Array<String> arguments) {
-		HashMap<String, String> hashMap;
-		int counter = 0;
-		for (String argument : arguments) {
-			hashMap.put("argument " + String::valueOf(counter), argument);
-			counter++;
+		static void main(Array<String> arguments) {
+			HashMap<String, String> hashMap;
+			int counter = 0;
+			for (String argument : arguments) {
+				hashMap.put("argument " + String::valueOf(counter), argument);
+				counter++;
+			}
+			// Collect key value pairs
+			String pairs = String("We have ") + String::valueOf(hashMap.size()) + String(" pairs: \n");
+			for (Map<String, String>::Entry entry : hashMap.entrySet()) {
+				pairs += entry.getKey() + String(" is ") + entry.getValue() + String("\n");
+			}
+			System::out::println(pairs);
+			// Serialize to json data
+			ArrayList<HashMap<String, String>> arrayList;
+			arrayList.add(hashMap);
+			System::out::println(arrayList.toString());
 		}
-		ArrayList<HashMap<String, String>> arrayList;
-		arrayList.add(hashMap);
-		System::out::println(arrayList.toString());
-	}
 };
 
 int main(int argc, char **argv) {

examples/Application/Main/Makefile

@@ -1,4 +1,4 @@
 all:
 	g++ -c -std=c++11 -o main.o MainApplication.cpp
-	gcc -o main main.o -lnative -lstdc++
+	g++ -o main main.o -lnative
 	./main one two three

java/io/BufferedReader/BufferedReader.hpp

@@ -33,11 +33,11 @@
 using namespace Java::Lang;
 
 namespace Java {
-	namespace IO {
-		class BufferedWriter : public virtual Reader {
-		
-		};
-	}
+		namespace IO {
+				class BufferedWriter : public virtual Reader {
+				
+				};
+		}
 }
 
 #endif  // JAVA_IO_BUFFERED_READER_HPP_

java/io/BufferedWriter/BufferedWriter.hpp

@@ -33,11 +33,11 @@
 using namespace Java::Lang;
 
 namespace Java {
-	namespace IO {
-		class BufferedReader : public virtual Reader {
-		
-		};
-	}
+		namespace IO {
+				class BufferedReader : public virtual Reader {
+				
+				};
+		}
 }
 
 #endif  // JAVA_IO_BUFFERED_READER_HPP_

java/io/FileWriter/FileWriter.hpp

@@ -33,11 +33,11 @@
 using namespace Java::Lang;
 
 namespace Java {
-	namespace IO {
-		class FileWriter : public virtual OutputStreamWriter {
-		
-		};
-	}
+		namespace IO {
+				class FileWriter : public virtual OutputStreamWriter {
+				
+				};
+		}
 }
 
 #endif  // JAVA_IO_FILE_HPP_

java/io/OutputStreamWriter/OutputStreamWriter.hpp

@@ -32,11 +32,11 @@
 using namespace Java::Lang;
 
 namespace Java {
-	namespace IO {
-		class OutputStreamWriter : public virtual Writer {
-		
-		};
-	}
+		namespace IO {
+				class OutputStreamWriter : public virtual Writer {
+				
+				};
+		}
 }
 
 #endif  // JAVA_IO_OUTPUT_SREAM_WRITER_HPP_