Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Don't change variable name
  • Loading branch information
TheAssassin committed Mar 12, 2018
1 parent dfeb647 commit d3e7a78
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -16,7 +16,7 @@ include(CTest)
execute_process(
COMMAND git describe --tags --always --abbrev=7
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_VERSION
OUTPUT_VARIABLE GIT_COMMIT
OUTPUT_STRIP_TRAILING_WHITESPACE
)

Expand All @@ -43,7 +43,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

# write version information for CPack to files
file(WRITE ${PROJECT_BINARY_DIR}/GIT_VERSION "${GIT_VERSION}")
file(WRITE ${PROJECT_BINARY_DIR}/GIT_COMMIT "${GIT_COMMIT}")


##########################
Expand Down
2 changes: 1 addition & 1 deletion Makefile.runtime
Expand Up @@ -17,7 +17,7 @@ all: runtime

# Compile runtime but do not link
runtime.o: runtime.c
$(CC) -c $(CFLAGS) $^ -DGIT_VERSION=\"$(git describe --tags --always --abbrev=7)\" \
$(CC) -c $(CFLAGS) $^ -DGIT_COMMIT=\"$(git describe --tags --always --abbrev=7)\" \
-I./squashfuse/ -D_FILE_OFFSET_BITS=64

# Add .upd_info and .sha256_sig sections
Expand Down
2 changes: 1 addition & 1 deletion build-tool-osx.sh
Expand Up @@ -101,7 +101,7 @@ cp ../squashfs-tools/squashfs-tools/mksquashfs .

# Compile appimagetool but do not link - glib version

$CC -DGIT_VERSION=\"$(git describe --tags --always --abbrev=7)\" -D_FILE_OFFSET_BITS=64 -I../squashfuse/ \
$CC -DGIT_COMMIT=\"$(git describe --tags --always --abbrev=7)\" -D_FILE_OFFSET_BITS=64 -I../squashfuse/ \
$(pkg-config --cflags glib-2.0) -g -Os ../getsection.c -c ../appimagetool.c

# Now statically link against libsquashfuse - glib version
Expand Down
4 changes: 2 additions & 2 deletions cmake/cpack_debs.cmake
Expand Up @@ -5,8 +5,8 @@ set(PROJECT_VERSION 1.0)
set(CPACK_GENERATOR "DEB")

set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION})
file(READ ${PROJECT_BINARY_DIR}/GIT_VERSION GIT_VERSION)
set(CPACK_DEBIAN_PACKAGE_RELEASE "git-${GIT_VERSION}")
file(READ ${PROJECT_BINARY_DIR}/GIT_COMMIT GIT_COMMIT)
set(CPACK_DEBIAN_PACKAGE_RELEASE "git-${GIT_COMMIT}")

set(CPACK_DEBIAN_PACKAGE_MAINTAINER "AppImage Team")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://appimage.org/")
Expand Down
8 changes: 4 additions & 4 deletions src/CMakeLists.txt
Expand Up @@ -41,7 +41,7 @@ set_target_properties(libappimage PROPERTIES PUBLIC_HEADER "${PROJECT_SOURCE_DIR

target_compile_definitions(libappimage
PRIVATE -D_FILE_OFFSET_BITS=64
PRIVATE -DGIT_VERSION="${GIT_VERSION}"
PRIVATE -DGIT_COMMIT="${GIT_COMMIT}"
PRIVATE -DENABLE_BINRELOC
)

Expand Down Expand Up @@ -89,7 +89,7 @@ set_target_properties(libappimage_static PROPERTIES PUBLIC_HEADER "${PROJECT_SOU

target_compile_definitions(libappimage_static
PRIVATE -D_FILE_OFFSET_BITS=64
PRIVATE -DGIT_VERSION="${GIT_VERSION}"
PRIVATE -DGIT_COMMIT="${GIT_COMMIT}"
PRIVATE -DENABLE_BINRELOC
)

Expand Down Expand Up @@ -146,7 +146,7 @@ target_link_libraries(appimagetool

target_compile_definitions(appimagetool
PRIVATE -D_FILE_OFFSET_BITS=64
PRIVATE -DGIT_VERSION="${GIT_VERSION}"
PRIVATE -DGIT_COMMIT="${GIT_COMMIT}"
PRIVATE -DBUILD_NUMBER="${BUILD_NUMBER}"
PRIVATE -DBUILD_DATE="${DATE}"
PRIVATE -DENABLE_BINRELOC
Expand Down Expand Up @@ -180,7 +180,7 @@ target_link_libraries(appimaged
)

target_compile_definitions(appimaged
PRIVATE -DGIT_VERSION="${GIT_VERSION}"
PRIVATE -DGIT_COMMIT="${GIT_COMMIT}"
PRIVATE -DBUILD_NUMBER="${BUILD_NUMBER}"
PRIVATE -DBUILD_DATE="${DATE}"
PRIVATE -D_FILE_OFFSET_BITS=64
Expand Down
2 changes: 1 addition & 1 deletion src/appimaged.c
Expand Up @@ -238,7 +238,7 @@ int main(int argc, char ** argv) {
fprintf(
stderr,
"appimaged, %s (commit %s), build %s built on %s\n",
RELEASE_NAME, GIT_VERSION, BUILD_NUMBER, BUILD_DATE
RELEASE_NAME, GIT_COMMIT, BUILD_NUMBER, BUILD_DATE
);

if(showVersionOnly)
Expand Down
2 changes: 1 addition & 1 deletion src/appimagetool.c
Expand Up @@ -503,7 +503,7 @@ main (int argc, char *argv[])
fprintf(
stderr,
"appimagetool, %s (commit %s), build %s built on %s\n",
RELEASE_NAME, GIT_VERSION, BUILD_NUMBER, BUILD_DATE
RELEASE_NAME, GIT_COMMIT, BUILD_NUMBER, BUILD_DATE
);

// always show version, but exit immediately if only the version number was requested
Expand Down
2 changes: 1 addition & 1 deletion src/build-runtime.sh.in
Expand Up @@ -36,7 +36,7 @@ trap cleanup EXIT
cd "$build_dir"

# Compile runtime but do not link
$CC -DGIT_VERSION=\"$git_version\" -I"@xz_INCLUDE_DIR@" -I"@squashfuse_INCLUDE_DIR@" \
$CC -DGIT_COMMIT=\"$git_version\" -I"@xz_INCLUDE_DIR@" -I"@squashfuse_INCLUDE_DIR@" \
-D_FILE_OFFSET_BITS=64 -g $small_FLAGS -c "$repo_root"/runtime.c

# Prepare 1024 bytes of space for updateinformation
Expand Down
4 changes: 2 additions & 2 deletions src/runtime.c
Expand Up @@ -413,7 +413,7 @@ main (int argc, char *argv[])
}

if(arg && strcmp(arg,"appimage-version")==0) {
fprintf(stderr,"Version: %s\n", GIT_VERSION);
fprintf(stderr,"Version: %s\n", GIT_COMMIT);
exit(0);
}

Expand Down Expand Up @@ -445,7 +445,7 @@ main (int argc, char *argv[])
// If there is an argument starting with appimage- (but not appimage-mount which is handled further down)
// then stop here and print an error message
if((arg && strncmp(arg, "appimage-", 8) == 0) && (arg && strcmp(arg,"appimage-mount")!=0)) {
fprintf(stderr,"--%s is not yet implemented in version %s\n", arg, GIT_VERSION);
fprintf(stderr,"--%s is not yet implemented in version %s\n", arg, GIT_COMMIT);
exit(1);
}

Expand Down
6 changes: 3 additions & 3 deletions src/shared.c
Expand Up @@ -555,11 +555,11 @@ bool write_edited_desktop_file(GKeyFile *key_file_structure, const char* appimag
g_free(icon_with_md5);
}

/* At compile time, inject GIT_VERSION like this:
* cc ... -DGIT_VERSION=\"$(git describe --tags --always --abbrev=7)\" -..
/* At compile time, inject GIT_COMMIT like this:
* cc ... -DGIT_COMMIT=\"$(git describe --tags --always --abbrev=7)\" -..
*/
{
gchar *generated_by = g_strdup_printf("Generated by appimaged %s", GIT_VERSION);
gchar *generated_by = g_strdup_printf("Generated by appimaged %s", GIT_COMMIT);
g_key_file_set_value(key_file_structure, "Desktop Entry", "X-AppImage-Comment", generated_by);
g_free(generated_by);
}
Expand Down

0 comments on commit d3e7a78

Please sign in to comment.