Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f868074f0c | ||
|
|
2fdd9fa13b | ||
|
|
40eec1fb23 | ||
|
|
42f93ba026 | ||
|
|
44ddaae28d | ||
|
|
5986fa8133 | ||
|
|
479e7c1f17 | ||
|
|
2dd52c32b7 |
@@ -23,9 +23,7 @@ if(PYTHONINTERP_FOUND)
|
||||
add_custom_command(
|
||||
OUTPUT ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_branch_name.py >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_commit_hash.py >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_tag_name.py >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5\"" > ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
@@ -36,9 +34,7 @@ elseif(UNIX)
|
||||
add_custom_command(
|
||||
OUTPUT ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${SCRIPT_DIR}/git_branch_name.sh >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${SCRIPT_DIR}/git_commit_hash.sh >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${SCRIPT_DIR}/git_tag_name.sh >> ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5\"" > ${GIT_VERSION_TMP_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
|
||||
COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
@@ -82,11 +78,11 @@ if(BUILD_REXLEDCTL)
|
||||
add_executable (rexledctl src/rexbacklight.c)
|
||||
add_dependencies(rexledctl common_srcs) #force common_srcs to be built first
|
||||
target_compile_definitions(rexledctl PRIVATE REXLEDCTL) #define REXLEDCTL in C files
|
||||
target_link_libraries(rexledctl PRIVATE $<TARGET_OBJECTS:common_srcs>) #link with the common_srcs "library"
|
||||
if(ENABLE_RESTORE_FILE)
|
||||
target_link_libraries(rexledctl PRIVATE "${RJP_LIB}") #link with rjp
|
||||
target_include_directories(rexledctl PUBLIC "${RJP_HEADER_DIR}") #include rjp.h directory
|
||||
endif()
|
||||
target_link_libraries(rexledctl PRIVATE $<TARGET_OBJECTS:common_srcs>) #link with the common_srcs "library"
|
||||
install(TARGETS rexledctl RUNTIME DESTINATION bin)
|
||||
if(INSTALL_UDEV_LED_RULE)
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/rules/91-leds.rules DESTINATION ${UDEV_DIR})
|
||||
@@ -95,13 +91,13 @@ endif()
|
||||
#build backlight control program
|
||||
if(BUILD_REXBACKLIGHT)
|
||||
add_executable (rexbacklight src/rexbacklight.c)
|
||||
add_dependencies(rexledctl common_srcs)
|
||||
add_dependencies(rexbacklight common_srcs)
|
||||
target_compile_definitions(rexbacklight PRIVATE REXBACKLIGHT)
|
||||
target_link_libraries(rexbacklight PRIVATE $<TARGET_OBJECTS:common_srcs>)
|
||||
if(ENABLE_RESTORE_FILE)
|
||||
target_link_libraries(rexbacklight PRIVATE "${RJP_LIB}")
|
||||
target_include_directories(rexbacklight PUBLIC "${RJP_HEADER_DIR}")
|
||||
endif()
|
||||
target_link_libraries(rexbacklight PRIVATE $<TARGET_OBJECTS:common_srcs>)
|
||||
install(TARGETS rexbacklight RUNTIME DESTINATION bin)
|
||||
if(INSTALL_UDEV_BACKLIGHT_RULE)
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/rules/91-backlight.rules DESTINATION ${UDEV_DIR})
|
||||
|
||||
@@ -155,7 +155,7 @@ struct arg_values process_cmd_args(int argc, char** argv){
|
||||
|
||||
//Check for switches
|
||||
if(CHECK_OPTION(GET, argv[i])){
|
||||
curr->operation |= OP_GET;
|
||||
curr->operation = OP_GET;
|
||||
continue;
|
||||
|
||||
}else if(CHECK_OPTION(FADE, argv[i])){
|
||||
|
||||
@@ -264,7 +264,8 @@ void do_list(struct arg_values* args){
|
||||
}
|
||||
|
||||
//Run requested operation on a per device basis
|
||||
void run_device_operations(struct arg_values* a){
|
||||
int run_device_operations(struct arg_values* a){
|
||||
int changes = 0;
|
||||
for(a = a->next;a;a = a->next){
|
||||
switch(a->operation){
|
||||
case OP_LIST:
|
||||
@@ -284,10 +285,12 @@ void run_device_operations(struct arg_values* a){
|
||||
case OP_SET:
|
||||
if(prep_offset(a))
|
||||
break;
|
||||
++changes;
|
||||
fade_out(a);
|
||||
break;
|
||||
};
|
||||
}
|
||||
return changes;
|
||||
}
|
||||
|
||||
//If a global operation is requested, run this to fill arg with all devices, each with the global operation
|
||||
@@ -312,6 +315,7 @@ int main(int argc, char** argv){
|
||||
|
||||
struct arg_values args; //A linked list of devices and the requested settings.
|
||||
struct string_array device_names; //List of all led/backlight devices in sysfs.
|
||||
int should_save = 0;
|
||||
|
||||
args = process_cmd_args(argc, argv);
|
||||
if(args.operation == OP_USAGE){
|
||||
@@ -360,9 +364,14 @@ int main(int argc, char** argv){
|
||||
if(!args.next){
|
||||
populate_args(&args, &device_names);
|
||||
}
|
||||
run_device_operations(&args);
|
||||
should_save = (run_device_operations(&args) > 0);
|
||||
#ifdef ENABLE_RESTORE_FILE
|
||||
save_restore_file(&device_names, &args); //performs cleanup on args
|
||||
if(should_save)
|
||||
save_restore_file(&device_names, &args); //performs cleanup on args
|
||||
else
|
||||
free_cmd_args(&args);
|
||||
#else
|
||||
free_cmd_args(&args);
|
||||
#endif
|
||||
|
||||
free_string_array(&device_names);
|
||||
|
||||
Reference in New Issue
Block a user