Browse Source

recursive zip, and longer git version abbreveatures

Stasik0 10 years ago
parent
commit
68bad2405d
2 changed files with 3 additions and 3 deletions
  1. 2 2
      .travis.yml
  2. 1 1
      CMakeLists.txt

+ 2 - 2
.travis.yml

@@ -42,7 +42,7 @@ script:
 - make -j
 - cp ../README.md .
 - cp -r ../doc .
-- zip open62541-win32.zip doc README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
+- zip -r open62541-win32.zip doc README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
 - cp open62541-win32.zip ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Cross compile release build for MinGW 64 bit"
@@ -50,7 +50,7 @@ script:
 - make -j
 - cp ../README.md .
 - cp -r ../doc .
-- zip open62541-win64.zip doc README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
+- zip -r open62541-win64.zip doc README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
 - cp open62541-win64.zip ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Cross compile release build for 32-bit linux"

+ 1 - 1
CMakeLists.txt

@@ -5,7 +5,7 @@ project(open62541 C)
 
 find_package(Git)
 if(GIT_FOUND)
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=4 --dirty --always --tags RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COM_ID )
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=7 --dirty --always --tags RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COM_ID )
     if( NOT ${res_var} EQUAL 0 )
         set( GIT_COMMIT_ID "git commit id unknown")
         message( WARNING "Git failed (not a repo, or no tags). Build will not contain git revision info." )