瀏覽代碼

easily ignore generated files

Stéphane Lepin 5 年之前
父節點
當前提交
fd1cf3f727

+ 3 - 0
.gitignore

@@ -8,3 +8,6 @@
 
 .vscode
 .idea
+
+# ignore generated files
+*.generated.*

+ 2 - 2
CI/macos/package-macos.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-source ../ci_config.inc.sh
+source ../ci_includes.generated.sh
 
 OSTYPE=$(uname)
 
@@ -44,7 +44,7 @@ else
 fi
 
 echo "=> Actual package build"
-packagesbuild ./CI/macos/installer-macOS.pkgproj
+packagesbuild ./CI/macos/installer-macOS.generated.pkgproj
 
 echo "=> Renaming $PLUGIN_NAME.pkg to $FILENAME"
 mv ./release/$PLUGIN_NAME.pkg ./release/$FILENAME_UNSIGNED

+ 13 - 13
CMakeLists.txt

@@ -21,34 +21,34 @@ endif()
 find_package(LibObs REQUIRED)
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
 
-set(PLUGIN_SOURCES
-	src/plugin-main.c)
-
-set(PLUGIN_HEADERS
-	src/plugin-macros.h)
-
 configure_file(
     src/plugin-macros.h.in
-    src/plugin-macros.h
+    src/plugin-macros.generated.h
 )
 configure_file(
     installer/installer-macOS.pkgproj.in
-    installer/installer-macOS.pkgproj
+    installer/installer-macOS.generated.pkgproj
 )
 configure_file(
     installer/installer-Windows.iss.in
-    installer/installer-Windows.iss
+    installer/installer-Windows.generated.iss
 )
 
 configure_file(
-    ci/ci_config.inc.sh.in
-    ci/ci_config.inc.sh
+    ci/ci_includes.sh.in
+    ci/ci_includes.generated.sh
 )
 configure_file(
-    ci/ci_config.inc.cmd.in
-    ci/ci_config.inc.cmd
+    ci/ci_includes.cmd.in
+    ci/ci_includes.generated.cmd
 )
 
+set(PLUGIN_SOURCES
+	src/plugin-main.c)
+
+set(PLUGIN_HEADERS
+	src/plugin-macros.generated.h)
+
 # --- Platform-independent build settings ---
 add_library(${CMAKE_PROJECT_NAME} MODULE ${PLUGIN_SOURCES} ${PLUGIN_HEADERS})
 

+ 0 - 0
ci/ci_config.inc.cmd.in → ci/ci_includes.cmd.in


+ 0 - 0
ci/ci_config.inc.sh.in → ci/ci_includes.sh.in


+ 1 - 1
ci/linux/package-ubuntu.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-source ../ci_config.inc.sh
+source ../ci_includes.generated.sh
 
 export GIT_HASH=$(git rev-parse --short HEAD)
 export PKG_VERSION="1-$GIT_HASH-$BRANCH_SHORT_NAME-git"

+ 2 - 2
ci/windows/package-windows.cmd

@@ -1,7 +1,7 @@
 mkdir package
 cd package
 
-call ..\ci_config.inc.cmd
+call ..\ci_includes.generated.cmd
 
 git rev-parse --short HEAD > package-version.txt
 set /p PackageVersion=<package-version.txt
@@ -11,4 +11,4 @@ REM Package ZIP archive
 7z a "%PluginName%-%PackageVersion%-Windows.zip" "..\release\*"
 
 REM Build installer
-iscc ..\installer\installer-Windows.iss /O. /F"%PluginName%-%PackageVersion%-Windows-Installer"
+iscc ..\installer\installer-Windows.generated.iss /O. /F"%PluginName%-%PackageVersion%-Windows-Installer"

+ 1 - 1
ci/windows/prepare-windows.cmd

@@ -1,7 +1,7 @@
 mkdir build32
 mkdir build64
 
-call ..\ci_config.inc.cmd
+call ..\ci_includes.generated.cmd
 
 cd build32
 cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DLibObs_DIR="%OBSPath%\build32\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..

+ 1 - 1
src/plugin-main.c

@@ -18,7 +18,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-module.h>
 
-#include "plugin-macros.h"
+#include "plugin-macros.generated.h"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE(PLUGIN_NAME, "en-US")