Skip to content

Commit da62e42

Browse files
committed
- Included Retrolambda Gradle plugin for additional syntactic sugar.
- Added fancy reveal animation to VerifyConnectionActivity - Removed dead code from Makefile
1 parent 6fffa39 commit da62e42

14 files changed

+494
-420
lines changed

Makefile

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# may be one of the following: drawin, linux, pi
1+
# may be one of the following: drawin, linux
22
BUILD_TARGET := linux
33

44
ifeq ($(BUILD_TARGET), darwin)
@@ -25,16 +25,6 @@ else ifeq ($(BUILD_TARGET), linux)
2525
CXXFLAGS := $(CXX_DEFAULT_INCLUDES) $(LOCAL_INCLUDES) -Wno-extra-tokens -fexceptions -g
2626
LIBRARY_FLAGS := -lpthread -lssl -lcrypto -lboost_system -lboost_regex -lboost_date_time -lboost_filesystem -lboost_thread
2727
LD_FLAGS := -shared -o libautom8.so
28-
else ifeq ($(BUILD_TARGET), pi)
29-
C := arm-linux-gnueabihf-gcc
30-
CXX := arm-linux-gnueabihf-g++
31-
DEFAULT_INCLUDES := -I$(HOME)/raspberrypi/rootfs/usr/include -I$(HOME)/raspberrypi/rootfs/usr/include/arm-linux-gnueabihf
32-
DEFAULT_LIBRARIES := -L$(HOME)/raspberrypi/rootfs/usr/lib -L$(HOME)/raspberrypi/rootfs/usr/lib/arm-linux-gnueabihf
33-
LOCAL_INCLUDES := -I./3rdparty/include -I./libautom8/include -g
34-
CFLAGS := $(LOCAL_INCLUDES) $(DEFAULT_INCLUDES) -Wno-extra-tokens -fPIC
35-
CXXFLAGS := $(CFLAGS) -fexceptions
36-
LIBRARY_FLAGS := $(DEFAULT_LIBRARIES) -licuuc -licudata -licui18n -lsqlite3 -lpthread -lssl -lcrypto -lboost_system -lboost_regex -lboost_date_time -lboost_filesystem -lboost_thread
37-
LD_FLAGS := -shared -o libautom8.so
3828
endif
3929

4030
C_SOURCES = \
@@ -75,15 +65,13 @@ CXX_SOURCES = \
7565
libautom8/src/device/x10/x10_security_sensor.cpp \
7666
libautom8/src/device/x10/mochad/mochad_controller.cpp \
7767
libautom8/src/device/x10/mochad/mochad_device_system.cpp \
78-
libautom8/src/autom8.cpp \
79-
autom8_cli/autom8_cli.cpp
68+
libautom8/src/autom8.cpp
8069

8170
CXX_OBJECTS = $(CXX_SOURCES:%.cpp=%.o)
8271
C_OBJECTS = $(C_SOURCES:%.c=%.o)
8372

8473
all: $(C_OBJECTS) $(CXX_OBJECTS)
8574
sh bin/gather_static_libraries
86-
#$(CXX) -o autom8_cli/autom8_cli $(C_OBJECTS) $(CXX_OBJECTS) $(LIBRARY_FLAGS)
8775
$(CXX) $(LD_FLAGS) $(C_OBJECTS) $(CXX_OBJECTS) $(LIBRARY_FLAGS)
8876

8977
%.o: %.cpp
@@ -92,12 +80,6 @@ all: $(C_OBJECTS) $(CXX_OBJECTS)
9280
%.o: %.c
9381
$(C) $(CFLAGS) -c -o $@ $<
9482

95-
# push: all
96-
# scp libautom8.so pi@autom8:/home/pi/src/autom8/
97-
# scp autom8_cli/autom8_cli pi@autom8:/home/pi/src/autom8/autom8_cli
98-
# scp -r autom8_node/server/frontend/* pi@autom8:/home/pi/src/autom8/autom8_node/server/frontend
99-
# scp -r autom8_node/server/backend/* pi@autom8:/home/pi/src/autom8/autom8_node/server/backend
100-
10183
clean:
10284
-rm -f $(CXX_OBJECTS) $(C_OBJECTS) *~
10385
-rm -f autom8_cli/autom8_cli

autom8_client_android/app/app.iml

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</configuration>
2424
</facet>
2525
</component>
26-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
27-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
27+
<output url="file://$MODULE_DIR$/build/retrolambda/debug" />
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
@@ -99,6 +99,7 @@
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101101
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/retrolambda" />
102103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
103104
</content>
104105
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

autom8_client_android/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ buildscript {
55

66
dependencies {
77
classpath 'com.android.tools.build:gradle:2.0.0'
8+
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
89
}
910
}
1011

1112
apply plugin: 'com.android.application'
13+
apply plugin: 'me.tatarka.retrolambda'
1214

1315
android {
1416
compileSdkVersion 23
@@ -22,6 +24,11 @@ android {
2224
versionName "0.8.0"
2325
}
2426

27+
compileOptions {
28+
sourceCompatibility JavaVersion.VERSION_1_8
29+
targetCompatibility JavaVersion.VERSION_1_8
30+
}
31+
2532
buildTypes {
2633
release {
2734
minifyEnabled false

0 commit comments

Comments
 (0)