amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 12:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Feature/dev (#1143)

Browse Source 
* 防止每次cmake后导致重复编译
This commit is contained in:
夏楚 2021-09-30 11:27:42 +08:00 committed by GitHub
parent a83187d25f
commit a548fcd709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/main.cpp
View File

@ -159,7 +159,7 @@ public:
[](const std::shared_ptr<ostream> &stream, const string &arg) -> bool { [](const std::shared_ptr<ostream> &stream, const string &arg) -> bool {
//版本信息 //版本信息
*stream << "编译日期: " << BUILD_TIME << std::endl; *stream << "编译日期: " << BUILD_TIME << std::endl;
*stream << "当前git分支: " << BRANCH_TIME << std::endl; *stream << "当前git分支: " << BRANCH_NAME << std::endl;
*stream << "当前git hash值: " << COMMIT_HASH << std::endl; *stream << "当前git hash值: " << COMMIT_HASH << std::endl;
throw ExitException(); throw ExitException();
}); });

20
src/Common/config.cpp
View File

@ -133,16 +133,16 @@ onceToken token([](){
#endif #endif
mINI::Instance()[kRootPath] = "./www"; mINI::Instance()[kRootPath] = "./www";
mINI::Instance()[kNotFound] = mINI::Instance()[kNotFound] = StrPrinter << "<html>"
"<html>" "<head><title>404 Not Found</title></head>"
"<head><title>404 Not Found</title></head>" "<body bgcolor=\"white\">"
"<body bgcolor=\"white\">" "<center><h1>您访问的资源不存在！</h1></center>"
"<center><h1>您访问的资源不存在！</h1></center>" "<hr><center>"
"<hr><center>" << SERVER_NAME
SERVER_NAME << "</center>"
"</center>" "</body>"
"</body>" "</html>"
"</html>"; << endl;
},nullptr); },nullptr);
}//namespace Http }//namespace Http

23
src/Common/macros.cpp Normal file
View File

@ -0,0 +1,23 @@
/*
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
*
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
*
* Use of this source code is governed by MIT license that can be found in the
* LICENSE file in the root of the source tree. All contributing project authors
* may be found in the AUTHORS file in the root of the source tree.
*/
#include "macros.h"
#if defined(ENABLE_VERSION)
#include "Version.h"
#endif
//请遵循MIT协议，勿修改服务器声明
#if !defined(ENABLE_VERSION)
const char SERVER_NAME[] = "ZLMediaKit-6.0(build in " __DATE__ " " __TIME__ ")";
#else
const char SERVER_NAME[] = "ZLMediaKit(git hash:" COMMIT_HASH ",branch:" BRANCH_NAME ",build time:" __DATE__ " " __TIME__ ")";
#endif

13
src/Common/macros.h
View File

@ -11,10 +11,6 @@
#ifndef ZLMEDIAKIT_MACROS_H #ifndef ZLMEDIAKIT_MACROS_H
#define ZLMEDIAKIT_MACROS_H #define ZLMEDIAKIT_MACROS_H
#if defined(ENABLE_VERSION)
#include "Version.h"
#endif
#if defined(__MACH__) #if defined(__MACH__)
#include <arpa/inet.h> #include <arpa/inet.h>
#include <machine/endian.h> #include <machine/endian.h>
@ -57,13 +53,6 @@
#define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;} #define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;}
#endif //CLEAR_ARR #endif //CLEAR_ARR
//请遵循MIT协议，勿修改服务器声明
#if !defined(ENABLE_VERSION)
#define SERVER_NAME "ZLMediaKit-6.0(build in " __DATE__ " " __TIME__ ")"
#else
#define SERVER_NAME "ZLMediaKit(git hash:" COMMIT_HASH ",branch:" BRANCH_TIME ",build time:" __DATE__ " " __TIME__ ")"
#endif
#define VHOST_KEY "vhost" #define VHOST_KEY "vhost"
#define HTTP_SCHEMA "http" #define HTTP_SCHEMA "http"
#define RTSP_SCHEMA "rtsp" #define RTSP_SCHEMA "rtsp"
@ -73,6 +62,8 @@
#define FMP4_SCHEMA "fmp4" #define FMP4_SCHEMA "fmp4"
#define DEFAULT_VHOST "__defaultVhost__" #define DEFAULT_VHOST "__defaultVhost__"
extern const char SERVER_NAME[];
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

2
version.h.ini
View File

@ -2,7 +2,7 @@
#define __GIT_VERSION_H__ #define __GIT_VERSION_H__
#define COMMIT_HASH "@COMMIT_HASH@" #define COMMIT_HASH "@COMMIT_HASH@"
#define BRANCH_TIME "@BRANCH_NAME@" #define BRANCH_NAME "@BRANCH_NAME@"
#define BUILD_TIME "@BUILD_TIME@" #define BUILD_TIME "@BUILD_TIME@"
#endif //__GIT_VERSION_H__ #endif //__GIT_VERSION_H__