Skip to content

Commit

Permalink
Cleaned out some AlShaders stuff, restored INSTALL and README
Browse files Browse the repository at this point in the history
  • Loading branch information
jonahf committed Jul 19, 2018
1 parent 3561191 commit 7259e33
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

project(alShaders2)

set(ALS_MAJOR_VERSION 2)
set(ALS_MINOR_VERSION 0)
set(ALS_PATCH_VERSION 0b4)
set(ALS_VERSION "${ALS_MAJOR_VERSION}.${ALS_MINOR_VERSION}.${ALS_PATCH_VERSION}")
set(CM_MAJOR_VERSION 1)
set(CM_MINOR_VERSION 0)
set(CM_PATCH_VERSION 0)
set(CM_VERSION "${CM_MAJOR_VERSION}.${CM_MINOR_VERSION}.${CM_PATCH_VERSION}")

set(CMAKE_VERBOSE_MAKEFILE FALSE)
set(CMAKE_SKIP_RPATH TRUE)
Expand Down Expand Up @@ -45,10 +45,10 @@ link_directories(${ARNOLD_LIBRARY_DIR})

if (NOT DEFINED INSTALL_DIR)
if (DEFINED INSTALL_ROOT)
set(INSTALL_DIR "${INSTALL_ROOT}/${ALS_VERSION}/ai${ARNOLD_VERSION}")
set(INSTALL_DIR "${INSTALL_ROOT}/${CM_VERSION}/ai${ARNOLD_VERSION}")
message("INSTALL_ROOT defined. Adding versions automatically:\n\t${INSTALL_DIR}")
else()
set(INSTALL_DIR "${CMAKE_BINARY_DIR}/dist/${ALS_VERSION}/ai${ARNOLD_VERSION}")
set(INSTALL_DIR "${CMAKE_BINARY_DIR}/dist/${CM_VERSION}/ai${ARNOLD_VERSION}")
message("INSTALL_DIR not defined. Defaulting to:\n\t${INSTALL_DIR}")
endif()
else()
Expand Down
1 change: 1 addition & 0 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Placeholder
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Placeholder
16 changes: 8 additions & 8 deletions package.in.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def mkdir_p(path):
pass
else: raise

MAJOR_VERSION = '@ALS_MAJOR_VERSION@'
MINOR_VERSION = '@ALS_MINOR_VERSION@'
PATCH_VERSION = '@ALS_PATCH_VERSION@'
ALS_VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
MAJOR_VERSION = '@CM_MAJOR_VERSION@'
MINOR_VERSION = '@CM_MINOR_VERSION@'
PATCH_VERSION = '@CM_PATCH_VERSION@'
CM_VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
ARNOLD_VERSION = '@ARNOLD_VERSION@'

subdirs = [
Expand Down Expand Up @@ -54,9 +54,9 @@ def mkdir_p(path):
# Binary distribution
files_src = ['INSTALL', 'CMakeLists.txt', 'package.in.py', 'README', 'uigen.py']

name_osx = 'alShaders-osx-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION)
name_win = 'alShaders-win-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION)
name_linux = 'alShaders-linux-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION)
name_osx = 'alShaders-osx-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION)
name_win = 'alShaders-win-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION)
name_linux = 'alShaders-linux-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION)


def copyPatternsToDistDir(subDirs, subDirPrefix, filePatterns, distDir):
Expand Down Expand Up @@ -109,7 +109,7 @@ def createBinaryDistribution(name, droot):
createSourceDistribution(name_src, ptrn_src, files_src)

# Binary distribution
droot = 'build/dist/%s/ai%s' % (ALS_VERSION, ARNOLD_VERSION)
droot = 'build/dist/%s/ai%s' % (CM_VERSION, ARNOLD_VERSION)

if platform.system() == "Darwin":
# OS X distribution
Expand Down

0 comments on commit 7259e33

Please sign in to comment.