Changeset 422:10a94c938da4 in SMSSender


Ignore:
Timestamp:
May 9, 2014 11:22:34 AM (4 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
default
Parents:
416:4ada10a14951 (diff), 421:b31840962826 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
  • Merges the win deployment branch back in.
Files:
26 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • deploy/howto.txt

    r413 r422  
    4545   
    4646WIN:
    47     * make -f deploy/win/Makefile clean build
     47    * hg up [tag]
     48        * ensure that all required libraries are installed according to the toolchain setup.
     49    * Open MSYS
     50        * cd /c/Development/smssender-build
     51        * qmake ../smssender/smssender.pro -spec win32-g++ -r "CONFIG+=release build-frontend-gui"
     52    * make
    4853    * Change version in the nsis setup file.
    4954    * Update the changelog.
    5055    * Run the nsis compiler.
    51 
    52     * When setting up the environment, make sure you have set the QMAKESPEC environment variable to [qtpath]/mkspecs/win32-g++
     56    * hg commit & merge & hg push
  • deploy/howto.txt

    r420 r422  
    10104. Increase the version in smssender.pri
    11115. hg commit -m "Increased the version number."
    12 6. hg update [tag]
    13127. Do not push until all is done!
    1413
    1514Ubuntu:
    1615    (Documentation: http://www.debian.org/doc/debian-policy/)
     16
     17    * Switch to ~/Development/smssender (do not use the shared directory!)
     18    * hg pull && hg update [tag]
     19    * Copy the changed deployment files from the shared directory (if needed).
    1720
    1821    * Run the deploy script ./deploy/ubuntu/deploy [revision]
     
    3235    * To completely simulate the build process as on launchpad use pbuilder.
    3336
     37    * Switch to main branch.
     38    * hg merge && hg commit -m "* Merges the ubuntu deployment branch back in."
     39    * hg push
     40
    3441
    3542
  • smssender.pri

    r409 r422  
    3333INCLUDEPATH *= $$PWD
    3434
     35LIB_PREFIX=lib
    3536LIB_SUFFIX=
    3637EXT_STATICLIB=a
     
    3839win32 {
    3940    VERSIONS = $$split(BASE_VERSION, ".")
     41    LIB_PREFIX =
    4042    LIB_SUFFIX = $$member(VERSIONS, 0)
    4143    EXT_DYNAMICLIB=dll
     44       
     45        CONFIG -= console
    4246}
    4347
  • smssender.pri

    r419 r422  
    1818include(smssender.prf)
    1919
    20 BASE_VERSION = 3.2
     20BASE_VERSION = 3.3
    2121
    22 DEVELOPMENT_VERSION = 3 # 0=alpha; 1=beta; 2=rc; 3=release
     22DEVELOPMENT_VERSION = 0 # 0=alpha; 1=beta; 2=rc; 3=release
    2323VERSION_REVISION = 0
    2424
Note: See TracChangeset for help on using the changeset viewer.