瀏覽代碼

Remove CMake stuff

Jakob Truelsen 16 年之前
父節點
當前提交
4d91ec2879
共有 2 個文件被更改,包括 3 次插入6 次删除
  1. 1 4
      scripts/release.sh
  2. 2 2
      scripts/test.sh

+ 1 - 4
scripts/release.sh

@@ -10,9 +10,6 @@ echo "About to release $v"
 read -p "Are you sure you are ready: " N
 [ "$N" != "YES" ] && exit
 
-sed -ri "s/SET\(CPACK_PACKAGE_VERSION_MAJOR \"[0-9]+\"\)/SET(CPACK_PACKAGE_VERSION_MAJOR \"$1\")/" CMakeLists.txt
-sed -ri "s/SET\(CPACK_PACKAGE_VERSION_MINOR \"[0-9]+\"\)/SET(CPACK_PACKAGE_VERSION_MINOR \"$2\")/" CMakeLists.txt
-sed -ri "s/SET\(CPACK_PACKAGE_VERSION_PATCH \"[0-9]+\"\)/SET(CPACK_PACKAGE_VERSION_PATCH \"$3\")/" CMakeLists.txt
 sed -ri "s/MAJOR_VERSION=[0-9]+ MINOR_VERSION=[0-9]+ PATCH_VERSION=[0-9]+/MAJOR_VERSION=$1 MINOR_VERSION=$2 PATCH_VERSION=$3/" wkhtmltopdf.pro
 
 ./scripts/static-build.sh linux || (echo Build failed; exit 1)
@@ -22,7 +19,7 @@ if ! ./scripts/test.sh; then
 fi
 ./scripts/static-build.sh win || (echo Build failed; exit 1)
 
-git commit -m "Making ready for version $v" CMakeLists.txt wkhtmltopdf.pro
+git commit -m "Making ready for version $v" wkhtmltopdf.pro
 git tag "$v"
 
 rm -rf release-$v

+ 2 - 2
scripts/test.sh

@@ -138,8 +138,8 @@ testImgSupport png
 testRemote 
 testSSL
 testHeaderFooter
-#testBuild qmake
-testBuild cmake
+testBuild qmake
+#testBuild cmake
 #Lets clean up
 rm tmp.html tmp.pdf
 exit $failed