Changeset 2824


Ignore:
Timestamp:
04/30/12 16:09:27 (2 years ago)
Author:
dbhart
Message:

No more MSI installers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pyutilib.virtualenv/trunk/scripts/create_setup

    r2656 r2824  
    8888     
    8989    # Build MSI Installers 
    90     installer.build_package_installers() 
     90    #installer.build_package_installers() 
    9191     
    9292    # # Modify MSI installer 
    93     installer.modify_package_installers() 
     93    #installer.modify_package_installers() 
    9494     
    9595    # # Write NSIS codes to NSH files 
     
    167167  ; 
    168168  ClearErrors 
    169   ExecWait '"$2" /S _?=$INSTDIR' $0 
     169  ;;ExecWait '"$2" /S _?=$INSTDIR' $0 
    170170  IfErrors 0 +3 
    171171     MessageBox MB_OK "Failed to uninstall ${PRODUCT_NAME}" IDOK 0 
     
    183183  ;;Push $INSTDIR\bin 
    184184  ;;Call un.RemoveFromPath 
    185   ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\\bin" 
     185  ;;${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\\bin" 
    186186 
    187187""" 
     
    463463  DetailPrint "" 
    464464  StrCpy $9 $PythonExecutable -11 
    465   ReadRegStr $2 "HKLM" "Software\\%(name)s" "ProductCode" 
    466   StrCmp "$2" "" install 
    467   DetailPrint "%(name)s is already installed on this machine! Checking version..." 
    468   ReadRegStr $3 "HKLM" "Software\\%(name)s" "Version" 
    469   DetailPrint " Package %(name)s version $3 is installed on this machine." 
    470   ${VersionCompare} '%(version)s' $3 $4 
    471   ;DetailPrint "Comparing version %(version)s to $3 with result $4" 
    472   StrCmp $4 '0' current 
    473   StrCmp $4 '1' uninstall newer 
    474 current: 
    475   DetailPrint "Congratulations! You already have the most current version of" 
    476   DetailPrint " %(name)s." 
    477   Goto done 
    478 newer: 
    479   DetailPrint "Hmm. Your version is newer than the one bundled here: %(version)s < $3" 
    480   DetailPrint "We are going to skip this package for now. You can always install it" 
    481   DetailPrint " by hand later from this program's 'Program Files' directory." 
    482   Goto done 
    483 uninstall: 
    484   DetailPrint "Seems like you have an older version of this package. We will try" 
    485   DetailPrint " to uninstall the old version before we install our new one, just" 
    486   DetailPrint " to be safe." 
    487   nsExec::ExecToLog 'msiexec.exe /X$2 /quiet' $0 
    488465install: 
    489466  DetailPrint "Installing %(name)s-%(version)s" 
    490   nsExec::ExecToLog 'msiexec.exe /I \"$INSTDIR\\%(msi_file)s\" /quiet TARGETDIR="$9"' $0 
     467  nsExec::ExecToLog '\"$PythonExecutable\" \"$INSTDIR\\%(name)s\\setup.py\" install' $0 
    491468done: 
    492469  DetailPrint "Package %(name)s complete." 
     
    499476  DetailPrint "Removing %(name)s Package" 
    500477  DetailPrint "--------------------------------------------------------------" 
    501   ReadRegStr $2 "HKLM" "Software\\%(name)s" "ProductCode" 
    502   nsExec::ExecToLog 'msiexec /X$2 /quiet' $0 
     478  nsExec::ExecToLog 'pip uninstall $(name)s -y' $0 
    503479SectionEnd 
    504480""" 
Note: See TracChangeset for help on using the changeset viewer.