Browse Source

Removed commit-hash tracking at Volker's request

IOSAD-201
Krista Bennett 9 months ago
committed by Andreas Buff
parent
commit
95f4e63495
8 changed files with 4 additions and 54 deletions
  1. +0
    -6
      scripts/git/post-checkout
  2. +0
    -6
      scripts/git/post-commit
  3. +0
    -6
      scripts/git/post-merge-commit
  4. +0
    -3
      scripts/git/pre-commit
  5. +4
    -15
      src/Makefile
  6. +0
    -1
      src/pEpEngine.c
  7. +0
    -10
      src/pEp_internal.h
  8. +0
    -7
      templates/commit_hash.h

+ 0
- 6
scripts/git/post-checkout View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 6
scripts/git/post-commit View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 6
scripts/git/post-merge-commit View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 3
scripts/git/pre-commit View File

@ -1,3 +0,0 @@
#! /bin/sh
rm src/commit_hash.h

+ 4
- 15
src/Makefile View File

@ -48,9 +48,6 @@ else
$(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
# Commit hash header file - if we don't run this, it won't build.
COMMIT_HASH:=$(shell git rev-parse HEAD)
ifdef SQLITE3_FROM_OS
NO_SOURCE+= sqlite3.c
CPPFLAGS+= -DSQLITE3_FROM_OS
@ -74,7 +71,7 @@ all: $(TARGET)
-include Makefile.protocols
%.d: %.c commit_hash.h
%.d: %.c
@set -e; rm -f $@; \
$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
@ -90,28 +87,20 @@ $(TARGET): libpEpEngine.a
.PHONY: objects clean install_headers install uninstall beinstall
commit_hash.h:
ifeq (,$(COMMIT_HASH))
$(shell cp ../templates/commit_hash.h commit_hash.h)
else
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$(COMMIT_HASH)\"/" ../templates/commit_hash.h > commit_hash.h
endif
objects: $(ALL_OBJECTS) commit_hash.h
objects: $(ALL_OBJECTS)
libpEpEngine.a: $(ALL_OBJECTS) commit_hash.h
libpEpEngine.a: $(ALL_OBJECTS)
$(AR) -rc $@ $^
clean:
rm -f *.d *.o *.a $(TARGET) *.dll *.so *.zip *.d.* *.def *~
rm -Rf $(TARGET).dSYM
rm -f KeySync_fsm.* Sync_actions.c Sync_event.* Sync_func.* Sync_impl.* sync_codec.* distribution_codec.*
rm -f commit_hash.h
# CAVEAT:
# install_headers is needed for building *STANDALONE* pEp MIME - it is NOT used for built-in functionality!!!
install_headers: $(TARGET) commit_hash.h
install_headers: $(TARGET)
mkdir -p $(PREFIX)/include/pEp
cp pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h \
timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h \


+ 0
- 1
src/pEpEngine.c View File

@ -217,7 +217,6 @@ DYNAMIC_API PEP_STATUS config_passphrase_for_new_keys(PEP_SESSION session, bool
return status;
}
DYNAMIC_API void config_service_log(PEP_SESSION session, bool enable)
{
assert(session);


+ 0
- 10
src/pEp_internal.h View File

@ -7,16 +7,6 @@
#ifndef PEP_INTERNAL_H
#define PEP_INTERNAL_H
#if defined __has_include
# if __has_include ("commit_hash.h")
# include "commit_hash.h"
# else
# define PEP_CURRENT_COMMIT_HASH = "DUMMY_COMMIT_HASH_ERROR"
# endif
#else
# include "commit_hash.h"
#endif
// maximum attachment size to import as key 25MB, maximum of 20 attachments
#define MAX_KEY_SIZE (25 * 1024 * 1024)
#define MAX_KEYS_TO_IMPORT 20


+ 0
- 7
templates/commit_hash.h View File

@ -1,7 +0,0 @@
#ifndef COMMIT_HASH_H
#define COMMIT_HASH_H
#define PEP_CURRENT_COMMIT_HASH "DUMMY_COMMIT_HASH_ERROR"
#endif

Loading…
Cancel
Save