Skip to content

Commit 542d09d

Browse files
author
Mark Visser
committed
removed generation of package.json, handled by CI
1 parent a677861 commit 542d09d

File tree

3 files changed

+3
-35
lines changed

3 files changed

+3
-35
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,3 @@ TestProjects/FbxTests/Logs/*
7979
com.unity.formats.fbx/Editor/Integrations~/**
8080
com.unity.formats.fbx/CHANGELOG.md
8181
com.unity.formats.fbx/LICENSE.md
82-
com.unity.formats.fbx/package.json
83-

CMakeLists.txt

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,6 @@ MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is: " ${CMAKE_INSTALL_PREFIX})
55

66
project (UnityFbxExporterEditorPackage NONE)
77

8-
###########################################################################
9-
10-
# Get git tag as package version
11-
find_package(Git REQUIRED)
12-
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags HEAD
13-
OUTPUT_VARIABLE PACKAGE_VERSION
14-
OUTPUT_STRIP_TRAILING_WHITESPACE)
15-
# only keep x.y.z[-preview.n]
16-
string(REGEX REPLACE "^.*([0-9]\.[0-9]\.[0-9].*)$" "\\1" PACKAGE_VERSION "${PACKAGE_VERSION}")
17-
18-
# Get git revision hash as package revision
19-
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
20-
OUTPUT_VARIABLE PACKAGE_REVISION
21-
OUTPUT_STRIP_TRAILING_WHITESPACE)
22-
23-
# Get git repo url
24-
execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
25-
OUTPUT_VARIABLE PACKAGE_REPO_URL
26-
OUTPUT_STRIP_TRAILING_WHITESPACE)
27-
28-
configure_file(${CMAKE_SOURCE_DIR}/package.json.in ${CMAKE_BINARY_DIR}/package.json @ONLY)
29-
308
###########################################################################
319
# Zip integrations folder
3210

@@ -83,7 +61,7 @@ install(
8361
DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx/Editor/Integrations~"
8462
)
8563
install(
86-
FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md" "${CMAKE_BINARY_DIR}/package.json"
64+
FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md"
8765
DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
8866
)
8967

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.unity.formats.fbx",
33
"displayName": "FBX Exporter",
4-
"version": "@PACKAGE_VERSION@",
4+
"version": "2.0.1-preview.11",
55
"dependencies": {
66
"com.unity.timeline": "1.0.0",
77
"com.autodesk.fbx": "2.0.0-preview.7"
@@ -15,13 +15,5 @@
1515
"modeling",
1616
"maya",
1717
"max"
18-
],
19-
"repository": {
20-
"url": "@PACKAGE_REPO_URL@",
21-
"type": "git",
22-
"revision": "@PACKAGE_REVISION@"
23-
},
24-
"relatedPackages": {
25-
"com.unity.formats.fbx.tests": "2.0.0-preview.3"
26-
}
18+
]
2719
}

0 commit comments

Comments
 (0)