summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/installer.nsi30
-rwxr-xr-xscripts/macosx-build-dependencies.sh8
-rwxr-xr-xscripts/publish-macosx.sh2
-rwxr-xr-xscripts/release-linux.sh6
4 files changed, 38 insertions, 8 deletions
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
new file mode 100644
index 0000000..269a30c
--- /dev/null
+++ b/scripts/installer.nsi
@@ -0,0 +1,30 @@
+!include "FileAssociation.nsh"
+Name "OpenSCAD"
+OutFile "openscad_setup.exe"
+InstallDir $PROGRAMFILES\OpenSCAD
+DirText "This will install OpenSCAD on your computer. Choose a directory"
+Section "install"
+SetOutPath $INSTDIR
+File openscad.exe
+File /r examples
+File /r libraries
+${registerExtension} "$INSTDIR\openscad.exe" ".scad" "OpenSCAD_File"
+CreateShortCut $SMPROGRAMS\OpenSCAD.lnk $INSTDIR\openscad.exe
+WriteUninstaller $INSTDIR\Uninstall.exe
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSCAD" "DisplayName" "OpenSCAD (remove only)"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSCAD" "UninstallString" "$INSTDIR\Uninstall.exe"
+SectionEnd
+Section "Uninstall"
+${unregisterExtension} ".scad" "OpenSCAD_File"
+Delete $INSTDIR\Uninstall.exe
+Delete $INSTDIR\MyProg.exe
+Delete $SMPROGRAMS\OpenSCAD.lnk
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSCAD"
+RMDir /r $INSTDIR\examples
+RMDir /r $INSTDIR\libraries\mcad
+Delete $INSTDIR\libraries\boxes.scad
+Delete $INSTDIR\libraries\shapes.scad
+RMDir $INSTDIR\libraries
+Delete $INSTDIR\openscad.exe
+RMDir $INSTDIR
+SectionEnd
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index f5a44d0..e011582 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -17,8 +17,8 @@
# o Port to other platforms?
#
-BASEDIR=/Users/kintel/code/metalab/checkout/OpenSCAD/libraries
-OPENSCADDIR=/Users/kintel/code/metalab/checkout/OpenSCAD/openscad-release
+BASEDIR=/Users/kintel/code/OpenSCAD/libraries
+OPENSCADDIR=/Users/kintel/code/OpenSCAD/openscad
SRCDIR=$BASEDIR/src
DEPLOYDIR=$BASEDIR/install
@@ -46,7 +46,7 @@ build_gmp()
# 64-bit version
mkdir build-x86_64
cd build-x86_64
- ../configure --prefix=$DEPLOYDIR/x86_64 "CFLAGS=-mmacosx-version-min=10.5" LDFLAGS="-mmacosx-version-min=10.5" --enable-cxx
+ ../configure --prefix=$DEPLOYDIR/x86_64 "CFLAGS=-mmacosx-version-min=10.5 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.5 -arch x86_64" ABI=64 --enable-cxx
make install
# merge
@@ -158,7 +158,7 @@ build_opencsg()
echo "Using basedir:" $BASEDIR
mkdir -p $SRCDIR $DEPLOYDIR
build_gmp 5.0.1
-build_mpfr 3.0.0
+build_mpfr 3.0.1
build_boost 1.46.1
build_cgal 3.7
build_glew 1.5.8
diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh
index 11820df..6415b52 100755
--- a/scripts/publish-macosx.sh
+++ b/scripts/publish-macosx.sh
@@ -1,7 +1,7 @@
#!/bin/sh
VERSION=`date "+%Y.%m.%d"`
-#VERSION=2010.05
+#VERSION=2011.06
# This is the same location as DEPLOYDIR in macosx-build-dependencies.sh
export MACOSX_DEPLOY_DIR=$PWD/../libraries/install
diff --git a/scripts/release-linux.sh b/scripts/release-linux.sh
index 8f532e0..35d177f 100755
--- a/scripts/release-linux.sh
+++ b/scripts/release-linux.sh
@@ -2,7 +2,7 @@
# WARNING: This script might only work with the authors setup...
VERSION=`date "+%Y.%m.%d"`
-#VERSION=2010.05
+#VERSION=2011.06
set -ex
@@ -30,8 +30,8 @@ gcc -o chrpath_linux scripts/chrpath_linux.c
./chrpath_linux -d release/lib/openscad/openscad
ldd openscad | sed -re 's,.* => ,,; s,[\t ].*,,;' -e '/Qt|boost/ { p; d; };' \
- -e '/lib(audio|CGAL|GLEW|opencsg|png)\.so/ { p; d; };' \
- -e 'd;' | xargs cp -vt release/lib/openscad/
+ -e '/lib(audio|CGAL|GLEW|opencsg|png|gmp|gmpxx|mpfr)\.so/ { p; d; };' \
+ -e 'd;' | xargs cp -vt release/lib/openscad/
strip release/lib/openscad/*
cat > release/install.sh << "EOT"
contact: Jan Huwald // Impressum